roll back PR 746 (worldTransform to identity) in master branch

empirephoenix-patch-1
Stephen Gold 7 years ago committed by Rémy Bouquet
parent 5c9ef17e73
commit e0230a4b12
  1. 18
      jme3-core/src/main/java/com/jme3/scene/Geometry.java

@ -137,20 +137,6 @@ public class Geometry extends Spatial {
return super.checkCulling(cam); return super.checkCulling(cam);
} }
/**
* Update the world transform of this Geometry and clear the
* TRANSFORM refresh flag.
*/
@Override
void checkDoTransformUpdate() {
if (ignoreTransform) {
worldTransform.loadIdentity();
refreshFlags &= ~RF_TRANSFORM;
} else {
super.checkDoTransformUpdate();
}
}
/** /**
* @return If ignoreTransform mode is set. * @return If ignoreTransform mode is set.
* *
@ -165,7 +151,6 @@ public class Geometry extends Spatial {
*/ */
public void setIgnoreTransform(boolean ignoreTransform) { public void setIgnoreTransform(boolean ignoreTransform) {
this.ignoreTransform = ignoreTransform; this.ignoreTransform = ignoreTransform;
setTransformRefresh();
} }
/** /**
@ -413,6 +398,9 @@ public class Geometry extends Spatial {
// Compute the cached world matrix // Compute the cached world matrix
cachedWorldMat.loadIdentity(); cachedWorldMat.loadIdentity();
if (ignoreTransform) {
return;
}
cachedWorldMat.setRotationQuaternion(worldTransform.getRotation()); cachedWorldMat.setRotationQuaternion(worldTransform.getRotation());
cachedWorldMat.setTranslation(worldTransform.getTranslation()); cachedWorldMat.setTranslation(worldTransform.getTranslation());

Loading…
Cancel
Save