diff options
author | Justin Clark-Casey (justincc) | 2012-04-22 20:28:12 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-04-22 20:28:12 +0100 |
commit | 49ed68e98c34c752fac407aa9359201e244df19f (patch) | |
tree | a4e802da78441e40068b56eb628c914575f1878a /OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs | |
parent | Make TestSetPhysicsSinglePrim() actually add the object to the scene in order... (diff) | |
download | opensim-SC_OLD-49ed68e98c34c752fac407aa9359201e244df19f.zip opensim-SC_OLD-49ed68e98c34c752fac407aa9359201e244df19f.tar.gz opensim-SC_OLD-49ed68e98c34c752fac407aa9359201e244df19f.tar.bz2 opensim-SC_OLD-49ed68e98c34c752fac407aa9359201e244df19f.tar.xz |
refactor: simply some properties code in BasicPhysicsPlugin
Diffstat (limited to 'OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs')
-rw-r--r-- | OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs | 42 |
1 files changed, 6 insertions, 36 deletions
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs index ba7fe1e..b89eeed 100644 --- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs | |||
@@ -36,14 +36,8 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
36 | { | 36 | { |
37 | public class BasicPhysicsPrim : PhysicsActor | 37 | public class BasicPhysicsPrim : PhysicsActor |
38 | { | 38 | { |
39 | private Vector3 _position; | ||
40 | private Vector3 _velocity; | ||
41 | private Vector3 _acceleration; | ||
42 | private Vector3 _size; | 39 | private Vector3 _size; |
43 | private PrimitiveBaseShape _shape; | 40 | private PrimitiveBaseShape _shape; |
44 | private Vector3 m_rotationalVelocity; | ||
45 | private bool flying; | ||
46 | private bool iscolliding; | ||
47 | 41 | ||
48 | public BasicPhysicsPrim( | 42 | public BasicPhysicsPrim( |
49 | string name, uint localId, Vector3 position, Vector3 size, Quaternion orientation, PrimitiveBaseShape shape) | 43 | string name, uint localId, Vector3 position, Vector3 size, Quaternion orientation, PrimitiveBaseShape shape) |
@@ -62,11 +56,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
62 | set { return; } | 56 | set { return; } |
63 | } | 57 | } |
64 | 58 | ||
65 | public override Vector3 RotationalVelocity | 59 | public override Vector3 RotationalVelocity { get; set; } |
66 | { | ||
67 | get { return m_rotationalVelocity; } | ||
68 | set { m_rotationalVelocity = value; } | ||
69 | } | ||
70 | 60 | ||
71 | public override bool SetAlwaysRun | 61 | public override bool SetAlwaysRun |
72 | { | 62 | { |
@@ -112,17 +102,9 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
112 | set { return; } | 102 | set { return; } |
113 | } | 103 | } |
114 | 104 | ||
115 | public override bool Flying | 105 | public override bool Flying { get; set; } |
116 | { | ||
117 | get { return flying; } | ||
118 | set { flying = value; } | ||
119 | } | ||
120 | 106 | ||
121 | public override bool IsColliding | 107 | public override bool IsColliding { get; set; } |
122 | { | ||
123 | get { return iscolliding; } | ||
124 | set { iscolliding = value; } | ||
125 | } | ||
126 | 108 | ||
127 | public override bool CollidingGround | 109 | public override bool CollidingGround |
128 | { | 110 | { |
@@ -141,11 +123,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
141 | get { return false; } | 123 | get { return false; } |
142 | } | 124 | } |
143 | 125 | ||
144 | public override Vector3 Position | 126 | public override Vector3 Position { get; set; } |
145 | { | ||
146 | get { return _position; } | ||
147 | set { _position = value; } | ||
148 | } | ||
149 | 127 | ||
150 | public override Vector3 Size | 128 | public override Vector3 Size |
151 | { | 129 | { |
@@ -213,11 +191,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
213 | get { return Vector3.Zero; } | 191 | get { return Vector3.Zero; } |
214 | } | 192 | } |
215 | 193 | ||
216 | public override Vector3 Velocity | 194 | public override Vector3 Velocity { get; set; } |
217 | { | ||
218 | get { return _velocity; } | ||
219 | set { _velocity = value; } | ||
220 | } | ||
221 | 195 | ||
222 | public override Vector3 Torque | 196 | public override Vector3 Torque |
223 | { | 197 | { |
@@ -233,11 +207,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
233 | 207 | ||
234 | public override Quaternion Orientation { get; set; } | 208 | public override Quaternion Orientation { get; set; } |
235 | 209 | ||
236 | public override Vector3 Acceleration | 210 | public override Vector3 Acceleration { get; set; } |
237 | { | ||
238 | get { return _acceleration; } | ||
239 | set { _acceleration = value; } | ||
240 | } | ||
241 | 211 | ||
242 | public override bool Kinematic | 212 | public override bool Kinematic |
243 | { | 213 | { |