OSDN Git Service

Fix in normals calculations when Y is up axis.
authorKaelthas_Spellsinger@o2.pl <Kaelthas_Spellsinger@o2.pl@75d07b2b-3a1a-0410-a2c5-0572b91ccdca>
Tue, 25 Oct 2011 19:26:58 +0000 (19:26 +0000)
committerKaelthas_Spellsinger@o2.pl <Kaelthas_Spellsinger@o2.pl@75d07b2b-3a1a-0410-a2c5-0572b91ccdca>
Tue, 25 Oct 2011 19:26:58 +0000 (19:26 +0000)
git-svn-id: http://jmonkeyengine.googlecode.com/svn/trunk@8528 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

engine/src/blender/com/jme3/scene/plugins/blender/meshes/MeshHelper.java

index 9b74f40..131eb68 100644 (file)
@@ -194,7 +194,12 @@ public class MeshHelper extends AbstractBlenderHelper {
             int v3 = ((Number) mFace.getFieldValue("v3")).intValue();\r
             int v4 = ((Number) mFace.getFieldValue("v4")).intValue();\r
 \r
-            Vector3f n = FastMath.computeNormal(vertices[v1], vertices[v2], vertices[v3]);\r
+            Vector3f n;\r
+            if(fixUpAxis) {\r
+               n = FastMath.computeNormal(vertices[v1], vertices[v3], vertices[v2]);\r
+            } else {\r
+               n = FastMath.computeNormal(vertices[v1], vertices[v2], vertices[v3]);\r
+            }\r
             this.addNormal(n, normalMap, smooth, vertices[v1], vertices[v2], vertices[v3]);\r
             normalList.add(normalMap.get(vertices[v1]));\r
             normalList.add(normalMap.get(vertices[v2]));\r
@@ -489,7 +494,7 @@ public class MeshHelper extends AbstractBlenderHelper {
      *             this exception is thrown when the blend file structure is somehow invalid or corrupted\r
      */\r
     @SuppressWarnings("unchecked")\r
-    public Vector3f[] getVertices(Structure meshStructure, BlenderContext blenderContext) throws BlenderFileException {\r
+    private Vector3f[] getVertices(Structure meshStructure, BlenderContext blenderContext) throws BlenderFileException {\r
         int verticesAmount = ((Number) meshStructure.getFieldValue("totvert")).intValue();\r
         Vector3f[] vertices = new Vector3f[verticesAmount];\r
         if (verticesAmount == 0) {\r