Skip to content

Fix NullPointer in MikktspaceTangentGenerator #2338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yaRnMcDonuts merged 5 commits into from
Jan 6, 2025
Merged

Fix NullPointer in MikktspaceTangentGenerator #2338

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4091b2e
Fix NullPointer in MikktspaceTangentGenerator
yaRnMcDonuts Dec 29, 2024
31fbf0a
Update MikktspaceTangentGenerator.java
yaRnMcDonuts Dec 29, 2024
14fc8bb
Update MikktspaceTangentGenerator.java
yaRnMcDonuts Dec 29, 2024
45ba9fb
Merge branch 'master' into yaRnMcDonuts-patch-1
yaRnMcDonuts Jan 5, 2025
ae03745
Update MikktspaceTangentGenerator.java
yaRnMcDonuts Jan 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions jme3-core/src/main/java/com/jme3/util/mikktspace/MikktspaceTangentGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import com.jme3.math.FastMath;
import com.jme3.math.Vector3f;
import com.jme3.scene.*;
import com.jme3.scene.VertexBuffer.Type;
import com.jme3.util.*;

import java.util.ArrayList;
Expand Down Expand Up @@ -129,12 +130,19 @@ public static void generate(Mesh mesh) {
private static boolean generateTangents(Mesh mesh) {
Mesh.Mode mode = mesh.getMode();
boolean hasTriangles;

if (mesh.getBuffer(Type.TexCoord) == null || mesh.getBuffer(Type.Normal) == null) {
logger.log(Level.SEVERE, "Tangent generation requires both a normal and texCoord buffer");
return false;
}

switch (mode) {
case Points:
case Lines:
case LineStrip:
case LineLoop:
hasTriangles = false; // skip this mesh
logger.log(Level.SEVERE, "Tangent generation requires a mesh with Triangles", mode);
break;

case Triangles:
Expand All @@ -148,12 +156,12 @@ private static boolean generateTangents(Mesh mesh) {
logger.log(Level.SEVERE, "Tangent generation isn't implemented for mode={0}", mode);
return false;
}

if (hasTriangles) {
MikkTSpaceImpl context = new MikkTSpaceImpl(mesh);
boolean result = genTangSpaceDefault(context);
boolean results = genTangSpaceDefault(context);
TangentUtils.generateBindPoseTangentsIfNecessary(mesh);
return result;
return results;
}
return false;
}
Expand Down
Loading