From e0230a4b12342aa4f07e43b3e1c31068f3cf398f Mon Sep 17 00:00:00 2001 From: Stephen Gold Date: Fri, 1 Dec 2017 13:18:49 -0800 Subject: [PATCH] roll back PR 746 (worldTransform to identity) in master branch --- .../src/main/java/com/jme3/scene/Geometry.java | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/jme3-core/src/main/java/com/jme3/scene/Geometry.java b/jme3-core/src/main/java/com/jme3/scene/Geometry.java index 6ba209bc3..9bd7ace97 100644 --- a/jme3-core/src/main/java/com/jme3/scene/Geometry.java +++ b/jme3-core/src/main/java/com/jme3/scene/Geometry.java @@ -137,20 +137,6 @@ public class Geometry extends Spatial { 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. * @@ -165,7 +151,6 @@ public class Geometry extends Spatial { */ public void setIgnoreTransform(boolean ignoreTransform) { this.ignoreTransform = ignoreTransform; - setTransformRefresh(); } /** @@ -413,6 +398,9 @@ public class Geometry extends Spatial { // Compute the cached world matrix cachedWorldMat.loadIdentity(); + if (ignoreTransform) { + return; + } cachedWorldMat.setRotationQuaternion(worldTransform.getRotation()); cachedWorldMat.setTranslation(worldTransform.getTranslation());