Forráskód Böngészése

- remove control.setSpatial in bullet physics controls

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10368 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
nor..67 12 éve
szülő
commit
88be282190

+ 0 - 1
engine/src/bullet-common/com/jme3/bullet/control/BetterCharacterControl.java

@@ -659,7 +659,6 @@ public class BetterCharacterControl extends AbstractPhysicsControl implements Ph
     public Control cloneForSpatial(Spatial spatial) {
         BetterCharacterControl control = new BetterCharacterControl(radius, height, mass);
         control.setJumpForce(jumpForce);
-        control.setSpatial(spatial);
         return control;
     }
 

+ 2 - 3
engine/src/bullet-common/com/jme3/bullet/control/CharacterControl.java

@@ -47,9 +47,10 @@ import com.jme3.scene.control.Control;
 import java.io.IOException;
 
 /**
- *
+ * @deprecated in favor of <code>BetterCharacterControl</code>
  * @author normenhansen
  */
+@Deprecated
 public class CharacterControl extends PhysicsCharacter implements PhysicsControl {
 
     protected Spatial spatial;
@@ -100,8 +101,6 @@ public class CharacterControl extends PhysicsCharacter implements PhysicsControl
         control.setPhysicsLocation(getPhysicsLocation());
         control.setUpAxis(getUpAxis());
         control.setApplyPhysicsLocal(isApplyPhysicsLocal());
-
-        control.setSpatial(spatial);
         return control;
     }
 

+ 0 - 2
engine/src/bullet-common/com/jme3/bullet/control/GhostControl.java

@@ -102,8 +102,6 @@ public class GhostControl extends PhysicsGhostObject implements PhysicsControl {
         control.setPhysicsLocation(getPhysicsLocation());
         control.setPhysicsRotation(getPhysicsRotationMatrix());
         control.setApplyPhysicsLocal(isApplyPhysicsLocal());
-
-        control.setSpatial(spatial);
         return control;
     }
 

+ 0 - 2
engine/src/bullet-common/com/jme3/bullet/control/RigidBodyControl.java

@@ -112,8 +112,6 @@ public class RigidBodyControl extends PhysicsRigidBody implements PhysicsControl
             control.setLinearVelocity(getLinearVelocity());
         }
         control.setApplyPhysicsLocal(isApplyPhysicsLocal());
-
-        control.setSpatial(spatial);
         return control;
     }
 

+ 0 - 2
engine/src/bullet-common/com/jme3/bullet/control/VehicleControl.java

@@ -152,8 +152,6 @@ public class VehicleControl extends PhysicsVehicle implements PhysicsControl {
             }
         }
         control.setApplyPhysicsLocal(isApplyPhysicsLocal());
-
-        control.setSpatial(spatial);
         return control;
     }