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

- remove control.setSpatial in bullet physics controls

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10368 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2013-02-09 01:37:48 +00:00
parent b17fbf1f49
commit 88be282190
5 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engine/src/bullet-common/com/jme3/bullet/control/BetterCharacterControl.java
View File

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

5
engine/src/bullet-common/com/jme3/bullet/control/CharacterControl.java
View File

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

2
engine/src/bullet-common/com/jme3/bullet/control/GhostControl.java
View File

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

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

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

2
engine/src/bullet-common/com/jme3/bullet/control/VehicleControl.java
View File

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