Skip to content

Commit d694f7a

Browse files
authored
test and fix for jMonkeyEngine#1909 (NPE while generating tangents) (jMonkeyEngine#1910)
* add a JUnit test for issue 1909 (NPE while generating tangents) * solve issue jMonkeyEngine#1909 (NPE while generating tangents)
1 parent 925ff45 commit d694f7a

File tree

2 files changed

+103
-2
lines changed

2 files changed

+103
-2
lines changed

jme3-core/src/main/java/com/jme3/util/mikktspace/MikkTSpaceImpl.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009-2021 jMonkeyEngine
2+
* Copyright (c) 2009-2023 jMonkeyEngine
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -44,9 +44,14 @@
4444
public class MikkTSpaceImpl implements MikkTSpaceContext {
4545

4646
Mesh mesh;
47+
final private IndexBuffer index;
4748

4849
public MikkTSpaceImpl(Mesh mesh) {
4950
this.mesh = mesh;
51+
52+
// If the mesh lacks indices, generate a virtual index buffer.
53+
this.index = mesh.getIndicesAsList();
54+
5055
//replacing any existing tangent buffer, if you came here you want them new.
5156
mesh.clearBuffer(VertexBuffer.Type.Tangent);
5257
FloatBuffer fb = BufferUtils.createFloatBuffer(mesh.getVertexCount() * 4);
@@ -115,7 +120,6 @@ public void setTSpace(float[] tangent, float[] biTangent, float magS, float magT
115120
}
116121

117122
private int getIndex(int face, int vert) {
118-
IndexBuffer index = mesh.getIndexBuffer();
119123
int vertIndex = index.get(face * 3 + vert);
120124
return vertIndex;
121125
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
/*
2+
* Copyright (c) 2023 jMonkeyEngine
3+
* All rights reserved.
4+
*
5+
* Redistribution and use in source and binary forms, with or without
6+
* modification, are permitted provided that the following conditions are
7+
* met:
8+
*
9+
* * Redistributions of source code must retain the above copyright
10+
* notice, this list of conditions and the following disclaimer.
11+
*
12+
* * Redistributions in binary form must reproduce the above copyright
13+
* notice, this list of conditions and the following disclaimer in the
14+
* documentation and/or other materials provided with the distribution.
15+
*
16+
* * Neither the name of 'jMonkeyEngine' nor the names of its contributors
17+
* may be used to endorse or promote products derived from this software
18+
* without specific prior written permission.
19+
*
20+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
21+
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
22+
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
23+
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
24+
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
25+
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
26+
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
27+
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
28+
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
29+
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
30+
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31+
*/
32+
package com.jme3.util;
33+
34+
import com.jme3.scene.Geometry;
35+
import com.jme3.scene.Mesh;
36+
import com.jme3.scene.VertexBuffer;
37+
import com.jme3.util.mikktspace.MikktspaceTangentGenerator;
38+
import java.nio.FloatBuffer;
39+
import org.junit.Assert;
40+
import org.junit.Test;
41+
42+
/**
43+
* Verifies that tangents can be generated without an index buffer. This was
44+
* issue #1909 at GitHub.
45+
*
46+
* @author Stephen Gold
47+
*/
48+
public class TestIssue1909 {
49+
/**
50+
* Tests MikktspaceTangentGenerator.generate() without index buffers.
51+
*/
52+
@Test
53+
public void testIssue1909() {
54+
/*
55+
* Generate normals, texture coordinates, and vertex positions
56+
* for a large square in the X-Z plane.
57+
*/
58+
FloatBuffer normals = BufferUtils.createFloatBuffer(
59+
0f, 1f, 0f,
60+
0f, 1f, 0f,
61+
0f, 1f, 0f,
62+
0f, 1f, 0f,
63+
0f, 1f, 0f,
64+
0f, 1f, 0f
65+
);
66+
float uvDiameter = 5f;
67+
FloatBuffer uvs = BufferUtils.createFloatBuffer(
68+
uvDiameter, uvDiameter,
69+
0f, 0f,
70+
uvDiameter, 0f,
71+
uvDiameter, uvDiameter,
72+
0f, uvDiameter,
73+
0f, 0f
74+
);
75+
float posRadius = 500f;
76+
FloatBuffer positions = BufferUtils.createFloatBuffer(
77+
+posRadius, 0f, +posRadius,
78+
-posRadius, 0f, -posRadius,
79+
-posRadius, 0f, +posRadius,
80+
+posRadius, 0f, +posRadius,
81+
+posRadius, 0f, -posRadius,
82+
-posRadius, 0f, -posRadius
83+
);
84+
Mesh mesh = new Mesh();
85+
int numAxes = 3;
86+
mesh.setBuffer(VertexBuffer.Type.Normal, numAxes, normals);
87+
mesh.setBuffer(VertexBuffer.Type.Position, numAxes, positions);
88+
mesh.setBuffer(VertexBuffer.Type.TexCoord, 2, uvs);
89+
mesh.updateBound();
90+
91+
Geometry testGeometry = new Geometry("testGeometry", mesh);
92+
MikktspaceTangentGenerator.generate(testGeometry);
93+
94+
VertexBuffer tangents = mesh.getBuffer(VertexBuffer.Type.Tangent);
95+
Assert.assertNotNull(tangents);
96+
}
97+
}

0 commit comments

Comments
 (0)