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

Bone, redid null check on scale in setBindTransform, ogre.xml can have null scale values

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7640 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
rem..om 2011-06-15 21:14:46 +00:00
parent e0ca5a4154
commit 42d0c8b8fd
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
engine/src/core/com/jme3/animation/Bone.java
View File

@ -264,7 +264,7 @@ public final class Bone implements Savable {
public Vector3f getWorldBindInverseScale() { public Vector3f getWorldBindInverseScale() {
return worldBindInverseScale; return worldBindInverseScale;
} }
/** /**
* Returns the world bind pose position. * Returns the world bind pose position.
* <p> * <p>
@ -288,7 +288,7 @@ public final class Bone implements Savable {
public Quaternion getWorldBindRotation() { public Quaternion getWorldBindRotation() {
return initialRot; return initialRot;
} }
/** /**
* Returns the world bind pose scale. * Returns the world bind pose scale.
* <p> * <p>
@ -459,7 +459,7 @@ public final class Bone implements Savable {
if (!userControl) { if (!userControl) {
throw new IllegalStateException("User control must be on bone to allow user transforms"); throw new IllegalStateException("User control must be on bone to allow user transforms");
} }
// TODO: add scale here ??? // TODO: add scale here ???
worldPos.set(translation); worldPos.set(translation);
worldRot.set(rotation); worldRot.set(rotation);
@ -555,11 +555,16 @@ public final class Bone implements Savable {
public void setBindTransforms(Vector3f translation, Quaternion rotation, Vector3f scale) { public void setBindTransforms(Vector3f translation, Quaternion rotation, Vector3f scale) {
initialPos.set(translation); initialPos.set(translation);
initialRot.set(rotation); initialRot.set(rotation);
initialScale.set(scale); //ogre.xml can have null scale values breaking this if the check is removed
if (scale != null) {
initialScale.set(scale);
}
localPos.set(translation); localPos.set(translation);
localRot.set(rotation); localRot.set(rotation);
localScale.set(scale); if (scale != null) {
localScale.set(scale);
}
} }
private String toString(int depth) { private String toString(int depth) {