From 88be2821903a02dd8d69cea582ca546f6227db1a Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Sat, 9 Feb 2013 01:37:48 +0000 Subject: [PATCH] - remove control.setSpatial in bullet physics controls git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10368 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../com/jme3/bullet/control/BetterCharacterControl.java | 1 - .../com/jme3/bullet/control/CharacterControl.java | 5 ++--- .../bullet-common/com/jme3/bullet/control/GhostControl.java | 2 -- .../com/jme3/bullet/control/RigidBodyControl.java | 2 -- .../com/jme3/bullet/control/VehicleControl.java | 2 -- 5 files changed, 2 insertions(+), 10 deletions(-) diff --git a/engine/src/bullet-common/com/jme3/bullet/control/BetterCharacterControl.java b/engine/src/bullet-common/com/jme3/bullet/control/BetterCharacterControl.java index a85a91497..35fe0f311 100644 --- a/engine/src/bullet-common/com/jme3/bullet/control/BetterCharacterControl.java +++ b/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; } diff --git a/engine/src/bullet-common/com/jme3/bullet/control/CharacterControl.java b/engine/src/bullet-common/com/jme3/bullet/control/CharacterControl.java index 80f8d86b8..becdc7914 100644 --- a/engine/src/bullet-common/com/jme3/bullet/control/CharacterControl.java +++ b/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 BetterCharacterControl * @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; } diff --git a/engine/src/bullet-common/com/jme3/bullet/control/GhostControl.java b/engine/src/bullet-common/com/jme3/bullet/control/GhostControl.java index f1ca3632a..9ed150556 100644 --- a/engine/src/bullet-common/com/jme3/bullet/control/GhostControl.java +++ b/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; } diff --git a/engine/src/bullet-common/com/jme3/bullet/control/RigidBodyControl.java b/engine/src/bullet-common/com/jme3/bullet/control/RigidBodyControl.java index 064b9ad08..c4c0f3995 100644 --- a/engine/src/bullet-common/com/jme3/bullet/control/RigidBodyControl.java +++ b/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; } diff --git a/engine/src/bullet-common/com/jme3/bullet/control/VehicleControl.java b/engine/src/bullet-common/com/jme3/bullet/control/VehicleControl.java index 545d7ca3b..0dc033331 100644 --- a/engine/src/bullet-common/com/jme3/bullet/control/VehicleControl.java +++ b/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; }