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

Merge pull request #612 from JavaSaBr/fixed_cloning_and_saving_RigidBodyControl-2

Browse Source 
Fixed saving/cloning enabled state of a RigidBodyControl.
This commit is contained in:
empirephoenix 2017-02-02 13:27:20 +01:00 committed by GitHub
commit 071e449a3e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jme3-bullet/src/common/java/com/jme3/bullet/control/RigidBodyControl.java
View File

@ -53,6 +53,7 @@ import com.jme3.scene.shape.Box;
import com.jme3.scene.shape.Sphere; import com.jme3.scene.shape.Sphere;
import com.jme3.util.clone.Cloner; import com.jme3.util.clone.Cloner;
import com.jme3.util.clone.JmeCloneable; import com.jme3.util.clone.JmeCloneable;
import java.io.IOException; import java.io.IOException;
/** /**
@ -143,6 +144,8 @@ public class RigidBodyControl extends PhysicsRigidBody implements PhysicsControl
} }
control.setApplyPhysicsLocal(isApplyPhysicsLocal()); control.setApplyPhysicsLocal(isApplyPhysicsLocal());
control.spatial = this.spatial; control.spatial = this.spatial;
control.setEnabled(isEnabled());
return control; return control;
} }
@ -273,9 +276,12 @@ public class RigidBodyControl extends PhysicsRigidBody implements PhysicsControl
added = false; added = false;
} }
} else { } else {
if(this.space==space) return; if (this.space == space) return;
space.addCollisionObject(this); // if this object isn't enabled, it will be added when it will be enabled.
added = true; if (isEnabled()) {
space.addCollisionObject(this);
added = true;
}
} }
this.space = space; this.space = space;
} }