sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes to Y is up axis arrow.

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8544 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
Kae..pl 2011-10-29 16:21:18 +00:00
parent 9bf315fbcf
commit 67930542ee
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,12 +194,7 @@ public class MeshHelper extends AbstractBlenderHelper {
int v3 = ((Number) mFace.getFieldValue("v3")).intValue(); int v3 = ((Number) mFace.getFieldValue("v3")).intValue();
int v4 = ((Number) mFace.getFieldValue("v4")).intValue(); int v4 = ((Number) mFace.getFieldValue("v4")).intValue();
Vector3f n; Vector3f n = FastMath.computeNormal(vertices[v1], vertices[v2], vertices[v3]);
if(fixUpAxis) {
n = FastMath.computeNormal(vertices[v1], vertices[v3], vertices[v2]);
} else {
n = FastMath.computeNormal(vertices[v1], vertices[v2], vertices[v3]);
}
this.addNormal(n, normalMap, smooth, 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[v1]));
normalList.add(normalMap.get(vertices[v2])); normalList.add(normalMap.get(vertices[v2]));
@ -506,7 +501,7 @@ public class MeshHelper extends AbstractBlenderHelper {
if(this.fixUpAxis) { if(this.fixUpAxis) {
for (int i = 0; i < verticesAmount; ++i) { for (int i = 0; i < verticesAmount; ++i) {
DynamicArray<Number> coordinates = (DynamicArray<Number>) mVerts.get(i).getFieldValue("co"); DynamicArray<Number> coordinates = (DynamicArray<Number>) 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 { } else {
for (int i = 0; i < verticesAmount; ++i) { for (int i = 0; i < verticesAmount; ++i) {

2
engine/src/blender/com/jme3/scene/plugins/blender/objects/ObjectHelper.java
View File

@ -312,7 +312,7 @@ public class ObjectHelper extends AbstractBlenderHelper {
y=scale.y; y=scale.y;
scale.y = scale.z; scale.y = scale.z;
scale.z = -y; scale.z = y;
} }
//create the result //create the result