diff options
author | John Hurliman | 2009-10-25 23:16:12 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-26 18:23:43 -0700 |
commit | d199767e6991d6f368661fce9c5a072e564b8a4b (patch) | |
tree | d9347b8a424c0164e208f908613aa8fe1511444b /OpenSim/Region/Physics/POSPlugin/POSPrim.cs | |
parent | * Double the priority on avatar bake texture requests to get avatars rezzing ... (diff) | |
download | opensim-SC_OLD-d199767e6991d6f368661fce9c5a072e564b8a4b.zip opensim-SC_OLD-d199767e6991d6f368661fce9c5a072e564b8a4b.tar.gz opensim-SC_OLD-d199767e6991d6f368661fce9c5a072e564b8a4b.tar.bz2 opensim-SC_OLD-d199767e6991d6f368661fce9c5a072e564b8a4b.tar.xz |
Experimental change of PhysicsVector to Vector3. Untested
Diffstat (limited to 'OpenSim/Region/Physics/POSPlugin/POSPrim.cs')
-rw-r--r-- | OpenSim/Region/Physics/POSPlugin/POSPrim.cs | 53 |
1 files changed, 25 insertions, 28 deletions
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs index b50364b..96c3e26 100644 --- a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs +++ b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs | |||
@@ -36,19 +36,16 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
36 | { | 36 | { |
37 | public class POSPrim : PhysicsActor | 37 | public class POSPrim : PhysicsActor |
38 | { | 38 | { |
39 | private PhysicsVector _position; | 39 | private Vector3 _position; |
40 | private PhysicsVector _velocity; | 40 | private Vector3 _velocity; |
41 | private PhysicsVector _acceleration; | 41 | private Vector3 _acceleration; |
42 | private PhysicsVector _size; | 42 | private Vector3 _size; |
43 | private PhysicsVector m_rotationalVelocity = PhysicsVector.Zero; | 43 | private Vector3 m_rotationalVelocity = Vector3.Zero; |
44 | private Quaternion _orientation; | 44 | private Quaternion _orientation; |
45 | private bool iscolliding; | 45 | private bool iscolliding; |
46 | 46 | ||
47 | public POSPrim() | 47 | public POSPrim() |
48 | { | 48 | { |
49 | _velocity = new PhysicsVector(); | ||
50 | _position = new PhysicsVector(); | ||
51 | _acceleration = new PhysicsVector(); | ||
52 | } | 49 | } |
53 | 50 | ||
54 | public override int PhysicsActorType | 51 | public override int PhysicsActorType |
@@ -57,7 +54,7 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
57 | set { return; } | 54 | set { return; } |
58 | } | 55 | } |
59 | 56 | ||
60 | public override PhysicsVector RotationalVelocity | 57 | public override Vector3 RotationalVelocity |
61 | { | 58 | { |
62 | get { return m_rotationalVelocity; } | 59 | get { return m_rotationalVelocity; } |
63 | set { m_rotationalVelocity = value; } | 60 | set { m_rotationalVelocity = value; } |
@@ -98,13 +95,13 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
98 | get { return false; } | 95 | get { return false; } |
99 | } | 96 | } |
100 | 97 | ||
101 | public override PhysicsVector Position | 98 | public override Vector3 Position |
102 | { | 99 | { |
103 | get { return _position; } | 100 | get { return _position; } |
104 | set { _position = value; } | 101 | set { _position = value; } |
105 | } | 102 | } |
106 | 103 | ||
107 | public override PhysicsVector Size | 104 | public override Vector3 Size |
108 | { | 105 | { |
109 | get { return _size; } | 106 | get { return _size; } |
110 | set { _size = value; } | 107 | set { _size = value; } |
@@ -115,9 +112,9 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
115 | get { return 0f; } | 112 | get { return 0f; } |
116 | } | 113 | } |
117 | 114 | ||
118 | public override PhysicsVector Force | 115 | public override Vector3 Force |
119 | { | 116 | { |
120 | get { return PhysicsVector.Zero; } | 117 | get { return Vector3.Zero; } |
121 | set { return; } | 118 | set { return; } |
122 | } | 119 | } |
123 | 120 | ||
@@ -132,7 +129,7 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
132 | 129 | ||
133 | } | 130 | } |
134 | 131 | ||
135 | public override void VehicleVectorParam(int param, PhysicsVector value) | 132 | public override void VehicleVectorParam(int param, Vector3 value) |
136 | { | 133 | { |
137 | 134 | ||
138 | } | 135 | } |
@@ -147,14 +144,14 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
147 | 144 | ||
148 | } | 145 | } |
149 | 146 | ||
150 | public override PhysicsVector CenterOfMass | 147 | public override Vector3 CenterOfMass |
151 | { | 148 | { |
152 | get { return PhysicsVector.Zero; } | 149 | get { return Vector3.Zero; } |
153 | } | 150 | } |
154 | 151 | ||
155 | public override PhysicsVector GeometricCenter | 152 | public override Vector3 GeometricCenter |
156 | { | 153 | { |
157 | get { return PhysicsVector.Zero; } | 154 | get { return Vector3.Zero; } |
158 | } | 155 | } |
159 | 156 | ||
160 | public override PrimitiveBaseShape Shape | 157 | public override PrimitiveBaseShape Shape |
@@ -173,7 +170,7 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
173 | set { return; } | 170 | set { return; } |
174 | } | 171 | } |
175 | 172 | ||
176 | public override PhysicsVector Velocity | 173 | public override Vector3 Velocity |
177 | { | 174 | { |
178 | get { return _velocity; } | 175 | get { return _velocity; } |
179 | set { _velocity = value; } | 176 | set { _velocity = value; } |
@@ -191,7 +188,7 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
191 | set { _orientation = value; } | 188 | set { _orientation = value; } |
192 | } | 189 | } |
193 | 190 | ||
194 | public override PhysicsVector Acceleration | 191 | public override Vector3 Acceleration |
195 | { | 192 | { |
196 | get { return _acceleration; } | 193 | get { return _acceleration; } |
197 | } | 194 | } |
@@ -202,26 +199,26 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
202 | set { } | 199 | set { } |
203 | } | 200 | } |
204 | 201 | ||
205 | public void SetAcceleration(PhysicsVector accel) | 202 | public void SetAcceleration(Vector3 accel) |
206 | { | 203 | { |
207 | _acceleration = accel; | 204 | _acceleration = accel; |
208 | } | 205 | } |
209 | 206 | ||
210 | public override void AddForce(PhysicsVector force, bool pushforce) | 207 | public override void AddForce(Vector3 force, bool pushforce) |
211 | { | 208 | { |
212 | } | 209 | } |
213 | 210 | ||
214 | public override void AddAngularForce(PhysicsVector force, bool pushforce) | 211 | public override void AddAngularForce(Vector3 force, bool pushforce) |
215 | { | 212 | { |
216 | } | 213 | } |
217 | 214 | ||
218 | public override PhysicsVector Torque | 215 | public override Vector3 Torque |
219 | { | 216 | { |
220 | get { return PhysicsVector.Zero; } | 217 | get { return Vector3.Zero; } |
221 | set { return; } | 218 | set { return; } |
222 | } | 219 | } |
223 | 220 | ||
224 | public override void SetMomentum(PhysicsVector momentum) | 221 | public override void SetMomentum(Vector3 momentum) |
225 | { | 222 | { |
226 | } | 223 | } |
227 | 224 | ||
@@ -255,7 +252,7 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
255 | { | 252 | { |
256 | } | 253 | } |
257 | 254 | ||
258 | public override void LockAngularMotion(PhysicsVector axis) | 255 | public override void LockAngularMotion(Vector3 axis) |
259 | { | 256 | { |
260 | } | 257 | } |
261 | 258 | ||
@@ -268,7 +265,7 @@ namespace OpenSim.Region.Physics.POSPlugin | |||
268 | { | 265 | { |
269 | } | 266 | } |
270 | 267 | ||
271 | public override PhysicsVector PIDTarget | 268 | public override Vector3 PIDTarget |
272 | { | 269 | { |
273 | set { return; } | 270 | set { return; } |
274 | } | 271 | } |