From 67930542ee99cbc8cc7d4a78e291287c2ac67aef Mon Sep 17 00:00:00 2001 From: "Kae..pl" Date: Sat, 29 Oct 2011 16:21:18 +0000 Subject: [PATCH] Fixes to Y is up axis arrow. git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8544 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../jme3/scene/plugins/blender/meshes/MeshHelper.java | 9 ++------- .../jme3/scene/plugins/blender/objects/ObjectHelper.java | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/meshes/MeshHelper.java b/engine/src/blender/com/jme3/scene/plugins/blender/meshes/MeshHelper.java index 131eb6854..a664f49e6 100644 --- a/engine/src/blender/com/jme3/scene/plugins/blender/meshes/MeshHelper.java +++ b/engine/src/blender/com/jme3/scene/plugins/blender/meshes/MeshHelper.java @@ -194,12 +194,7 @@ public class MeshHelper extends AbstractBlenderHelper { int v3 = ((Number) mFace.getFieldValue("v3")).intValue(); int v4 = ((Number) mFace.getFieldValue("v4")).intValue(); - Vector3f n; - if(fixUpAxis) { - n = FastMath.computeNormal(vertices[v1], vertices[v3], vertices[v2]); - } else { - n = FastMath.computeNormal(vertices[v1], vertices[v2], vertices[v3]); - } + Vector3f n = FastMath.computeNormal(vertices[v1], vertices[v2], vertices[v3]); this.addNormal(n, normalMap, smooth, vertices[v1], vertices[v2], vertices[v3]); normalList.add(normalMap.get(vertices[v1])); normalList.add(normalMap.get(vertices[v2])); @@ -506,7 +501,7 @@ public class MeshHelper extends AbstractBlenderHelper { if(this.fixUpAxis) { for (int i = 0; i < verticesAmount; ++i) { DynamicArray coordinates = (DynamicArray) mVerts.get(i).getFieldValue("co"); - vertices[i] = new Vector3f(coordinates.get(0).floatValue(), coordinates.get(2).floatValue(), coordinates.get(1).floatValue()); + vertices[i] = new Vector3f(coordinates.get(0).floatValue(), coordinates.get(2).floatValue(), -coordinates.get(1).floatValue()); } } else { for (int i = 0; i < verticesAmount; ++i) { diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/objects/ObjectHelper.java b/engine/src/blender/com/jme3/scene/plugins/blender/objects/ObjectHelper.java index 1089b8b7c..67775b395 100644 --- a/engine/src/blender/com/jme3/scene/plugins/blender/objects/ObjectHelper.java +++ b/engine/src/blender/com/jme3/scene/plugins/blender/objects/ObjectHelper.java @@ -312,7 +312,7 @@ public class ObjectHelper extends AbstractBlenderHelper { y=scale.y; scale.y = scale.z; - scale.z = -y; + scale.z = y; } //create the result