aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-04-22 20:28:12 +0100
committerJustin Clark-Casey (justincc)2012-04-22 20:28:12 +0100
commit49ed68e98c34c752fac407aa9359201e244df19f (patch)
treea4e802da78441e40068b56eb628c914575f1878a /OpenSim/Region
parentMake TestSetPhysicsSinglePrim() actually add the object to the scene in order... (diff)
downloadopensim-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')
-rw-r--r--OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs42
-rw-r--r--OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs42
2 files changed, 12 insertions, 72 deletions
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
index b1a3ff9..e43136a 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
@@ -36,13 +36,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
36{ 36{
37 public class BasicActor : PhysicsActor 37 public class BasicActor : 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 Vector3 m_rotationalVelocity;
44 private bool flying;
45 private bool iscolliding;
46 40
47 public BasicActor(Vector3 size) 41 public BasicActor(Vector3 size)
48 { 42 {
@@ -55,11 +49,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
55 set { return; } 49 set { return; }
56 } 50 }
57 51
58 public override Vector3 RotationalVelocity 52 public override Vector3 RotationalVelocity { get; set; }
59 {
60 get { return m_rotationalVelocity; }
61 set { m_rotationalVelocity = value; }
62 }
63 53
64 public override bool SetAlwaysRun 54 public override bool SetAlwaysRun
65 { 55 {
@@ -105,17 +95,9 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
105 set { return; } 95 set { return; }
106 } 96 }
107 97
108 public override bool Flying 98 public override bool Flying { get; set; }
109 {
110 get { return flying; }
111 set { flying = value; }
112 }
113 99
114 public override bool IsColliding 100 public override bool IsColliding { get; set; }
115 {
116 get { return iscolliding; }
117 set { iscolliding = value; }
118 }
119 101
120 public override bool CollidingGround 102 public override bool CollidingGround
121 { 103 {
@@ -134,11 +116,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
134 get { return false; } 116 get { return false; }
135 } 117 }
136 118
137 public override Vector3 Position 119 public override Vector3 Position { get; set; }
138 {
139 get { return _position; }
140 set { _position = value; }
141 }
142 120
143 public override Vector3 Size 121 public override Vector3 Size
144 { 122 {
@@ -206,11 +184,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
206 get { return Vector3.Zero; } 184 get { return Vector3.Zero; }
207 } 185 }
208 186
209 public override Vector3 Velocity 187 public override Vector3 Velocity { get; set; }
210 {
211 get { return _velocity; }
212 set { _velocity = value; }
213 }
214 188
215 public override Vector3 Torque 189 public override Vector3 Torque
216 { 190 {
@@ -230,11 +204,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
230 set { } 204 set { }
231 } 205 }
232 206
233 public override Vector3 Acceleration 207 public override Vector3 Acceleration { get; set; }
234 {
235 get { return _acceleration; }
236 set { _acceleration = value; }
237 }
238 208
239 public override bool Kinematic 209 public override bool Kinematic
240 { 210 {
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 {
generated by cgit v1.1 at 2024-12-28 00:30:26 +0000