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

Changes to Y-is-Up-Axis issue.

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8516 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
Kae..pl 2011-10-23 14:30:22 +00:00
parent 65cbed47c6
commit 18ce27faae
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/src/blender/com/jme3/scene/plugins/blender/BlenderLoader.java
View File

@ -210,7 +210,9 @@ public class BlenderLoader extends AbstractBlenderLoader {
helper = blenderContext.getHelper(CurvesHelper.class);
helper.setyIsUpAxis(true);
helper = blenderContext.getHelper(ArmatureHelper.class);
helper.setyIsUpAxis(true);
helper.setyIsUpAxis(true);
helper = blenderContext.getHelper(MeshHelper.class);
helper.setyIsUpAxis(true);
}
MaterialHelper materialHelper = blenderContext.getHelper(MaterialHelper.class);
materialHelper.setFaceCullMode(blenderKey.getFaceCullMode());

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

@ -498,9 +498,16 @@ public class MeshHelper extends AbstractBlenderHelper {
Pointer pMVert = (Pointer) meshStructure.getFieldValue("mvert");
List<Structure> mVerts = pMVert.fetchData(blenderContext.getInputStream());
for (int i = 0; i < verticesAmount; ++i) {
DynamicArray<Number> coordinates = (DynamicArray<Number>) mVerts.get(i).getFieldValue("co");
vertices[i] = new Vector3f(coordinates.get(0).floatValue(), coordinates.get(1).floatValue(), coordinates.get(2).floatValue());
if(this.fixUpAxis) {
for (int i = 0; i < verticesAmount; ++i) {
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());
}
} else {
for (int i = 0; i < verticesAmount; ++i) {
DynamicArray<Number> coordinates = (DynamicArray<Number>) mVerts.get(i).getFieldValue("co");
vertices[i] = new Vector3f(coordinates.get(0).floatValue(), coordinates.get(1).floatValue(), coordinates.get(2).floatValue());
}
}
return vertices;
}

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

@ -282,14 +282,6 @@ public class ObjectHelper extends AbstractBlenderHelper {
//load parent inverse matrix
Pointer pParent = (Pointer) objectStructure.getFieldValue("parent");
Structure parent = null;
if(pParent.isNotNull()) {
try {
parent = pParent.fetchData(blenderContext.getInputStream()).get(0);
} catch (BlenderFileException e) {
LOGGER.log(Level.WARNING, "Cannot fetch parent for object! Reason: {0}", e.getLocalizedMessage());
}
}
Matrix4f parentInv = pParent.isNull() ? Matrix4f.IDENTITY : this.getMatrix(objectStructure, "parentinv");
//create the global matrix (without the scale)
@ -309,12 +301,18 @@ public class ObjectHelper extends AbstractBlenderHelper {
size.get(1).floatValue() * scaleY,
size.get(2).floatValue() * scaleZ);
//the root object is transformed if the Y axis is UP
if(fixUpAxis && (pParent.isNull() || (parent!=null && !this.shouldBeLoaded(parent, blenderContext)))) {
if(fixUpAxis) {
float y = translation.y;
translation.y = translation.z;
translation.z = -y;
rotation = this.upAxisRotationQuaternion.mult(rotation);
y = rotation.getY();
float z = rotation.getZ();
rotation.set(rotation.getX(), z, -y, rotation.getW());
y=scale.y;
scale.y = scale.z;
scale.z = -y;
}
//create the result