diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index 7603131..6bfdff2 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -32,8 +32,8 @@ using OpenMetaverse; | |||
32 | 32 | ||
33 | namespace OpenSim.Region.Physics.Manager | 33 | namespace OpenSim.Region.Physics.Manager |
34 | { | 34 | { |
35 | public delegate void PositionUpdate(PhysicsVector position); | 35 | public delegate void PositionUpdate(Vector3 position); |
36 | public delegate void VelocityUpdate(PhysicsVector velocity); | 36 | public delegate void VelocityUpdate(Vector3 velocity); |
37 | public delegate void OrientationUpdate(Quaternion orientation); | 37 | public delegate void OrientationUpdate(Quaternion orientation); |
38 | 38 | ||
39 | public enum ActorTypes : int | 39 | public enum ActorTypes : int |
@@ -106,7 +106,7 @@ namespace OpenSim.Region.Physics.Manager | |||
106 | { | 106 | { |
107 | public delegate void RequestTerseUpdate(); | 107 | public delegate void RequestTerseUpdate(); |
108 | public delegate void CollisionUpdate(EventArgs e); | 108 | public delegate void CollisionUpdate(EventArgs e); |
109 | public delegate void OutOfBounds(PhysicsVector pos); | 109 | public delegate void OutOfBounds(Vector3 pos); |
110 | 110 | ||
111 | // disable warning: public events | 111 | // disable warning: public events |
112 | #pragma warning disable 67 | 112 | #pragma warning disable 67 |
@@ -125,7 +125,7 @@ namespace OpenSim.Region.Physics.Manager | |||
125 | 125 | ||
126 | public abstract bool Stopped { get; } | 126 | public abstract bool Stopped { get; } |
127 | 127 | ||
128 | public abstract PhysicsVector Size { get; set; } | 128 | public abstract Vector3 Size { get; set; } |
129 | 129 | ||
130 | public abstract PrimitiveBaseShape Shape { set; } | 130 | public abstract PrimitiveBaseShape Shape { set; } |
131 | 131 | ||
@@ -144,7 +144,7 @@ namespace OpenSim.Region.Physics.Manager | |||
144 | 144 | ||
145 | public abstract void delink(); | 145 | public abstract void delink(); |
146 | 146 | ||
147 | public abstract void LockAngularMotion(PhysicsVector axis); | 147 | public abstract void LockAngularMotion(Vector3 axis); |
148 | 148 | ||
149 | public virtual void RequestPhysicsterseUpdate() | 149 | public virtual void RequestPhysicsterseUpdate() |
150 | { | 150 | { |
@@ -159,7 +159,7 @@ namespace OpenSim.Region.Physics.Manager | |||
159 | } | 159 | } |
160 | } | 160 | } |
161 | 161 | ||
162 | public virtual void RaiseOutOfBounds(PhysicsVector pos) | 162 | public virtual void RaiseOutOfBounds(Vector3 pos) |
163 | { | 163 | { |
164 | // Make a temporary copy of the event to avoid possibility of | 164 | // Make a temporary copy of the event to avoid possibility of |
165 | // a race condition if the last subscriber unsubscribes | 165 | // a race condition if the last subscriber unsubscribes |
@@ -187,23 +187,23 @@ namespace OpenSim.Region.Physics.Manager | |||
187 | 187 | ||
188 | } | 188 | } |
189 | 189 | ||
190 | public abstract PhysicsVector Position { get; set; } | 190 | public abstract Vector3 Position { get; set; } |
191 | public abstract float Mass { get; } | 191 | public abstract float Mass { get; } |
192 | public abstract PhysicsVector Force { get; set; } | 192 | public abstract Vector3 Force { get; set; } |
193 | 193 | ||
194 | public abstract int VehicleType { get; set; } | 194 | public abstract int VehicleType { get; set; } |
195 | public abstract void VehicleFloatParam(int param, float value); | 195 | public abstract void VehicleFloatParam(int param, float value); |
196 | public abstract void VehicleVectorParam(int param, PhysicsVector value); | 196 | public abstract void VehicleVectorParam(int param, Vector3 value); |
197 | public abstract void VehicleRotationParam(int param, Quaternion rotation); | 197 | public abstract void VehicleRotationParam(int param, Quaternion rotation); |
198 | 198 | ||
199 | public abstract void SetVolumeDetect(int param); // Allows the detection of collisions with inherently non-physical prims. see llVolumeDetect for more | 199 | public abstract void SetVolumeDetect(int param); // Allows the detection of collisions with inherently non-physical prims. see llVolumeDetect for more |
200 | 200 | ||
201 | public abstract PhysicsVector GeometricCenter { get; } | 201 | public abstract Vector3 GeometricCenter { get; } |
202 | public abstract PhysicsVector CenterOfMass { get; } | 202 | public abstract Vector3 CenterOfMass { get; } |
203 | public abstract PhysicsVector Velocity { get; set; } | 203 | public abstract Vector3 Velocity { get; set; } |
204 | public abstract PhysicsVector Torque { get; set; } | 204 | public abstract Vector3 Torque { get; set; } |
205 | public abstract float CollisionScore { get; set;} | 205 | public abstract float CollisionScore { get; set;} |
206 | public abstract PhysicsVector Acceleration { get; } | 206 | public abstract Vector3 Acceleration { get; } |
207 | public abstract Quaternion Orientation { get; set; } | 207 | public abstract Quaternion Orientation { get; set; } |
208 | public abstract int PhysicsActorType { get; set; } | 208 | public abstract int PhysicsActorType { get; set; } |
209 | public abstract bool IsPhysical { get; set; } | 209 | public abstract bool IsPhysical { get; set; } |
@@ -214,12 +214,12 @@ namespace OpenSim.Region.Physics.Manager | |||
214 | public abstract bool CollidingGround { get; set; } | 214 | public abstract bool CollidingGround { get; set; } |
215 | public abstract bool CollidingObj { get; set; } | 215 | public abstract bool CollidingObj { get; set; } |
216 | public abstract bool FloatOnWater { set; } | 216 | public abstract bool FloatOnWater { set; } |
217 | public abstract PhysicsVector RotationalVelocity { get; set; } | 217 | public abstract Vector3 RotationalVelocity { get; set; } |
218 | public abstract bool Kinematic { get; set; } | 218 | public abstract bool Kinematic { get; set; } |
219 | public abstract float Buoyancy { get; set; } | 219 | public abstract float Buoyancy { get; set; } |
220 | 220 | ||
221 | // Used for MoveTo | 221 | // Used for MoveTo |
222 | public abstract PhysicsVector PIDTarget { set;} | 222 | public abstract Vector3 PIDTarget { set; } |
223 | public abstract bool PIDActive { set;} | 223 | public abstract bool PIDActive { set;} |
224 | public abstract float PIDTau { set; } | 224 | public abstract float PIDTau { set; } |
225 | 225 | ||
@@ -231,9 +231,9 @@ namespace OpenSim.Region.Physics.Manager | |||
231 | public abstract float PIDHoverTau { set;} | 231 | public abstract float PIDHoverTau { set;} |
232 | 232 | ||
233 | 233 | ||
234 | public abstract void AddForce(PhysicsVector force, bool pushforce); | 234 | public abstract void AddForce(Vector3 force, bool pushforce); |
235 | public abstract void AddAngularForce(PhysicsVector force, bool pushforce); | 235 | public abstract void AddAngularForce(Vector3 force, bool pushforce); |
236 | public abstract void SetMomentum(PhysicsVector momentum); | 236 | public abstract void SetMomentum(Vector3 momentum); |
237 | public abstract void SubscribeEvents(int ms); | 237 | public abstract void SubscribeEvents(int ms); |
238 | public abstract void UnSubscribeEvents(); | 238 | public abstract void UnSubscribeEvents(); |
239 | public abstract bool SubscribedEvents(); | 239 | public abstract bool SubscribedEvents(); |
@@ -246,9 +246,9 @@ namespace OpenSim.Region.Physics.Manager | |||
246 | get{ return false; } | 246 | get{ return false; } |
247 | } | 247 | } |
248 | 248 | ||
249 | public override PhysicsVector Position | 249 | public override Vector3 Position |
250 | { | 250 | { |
251 | get { return PhysicsVector.Zero; } | 251 | get { return Vector3.Zero; } |
252 | set { return; } | 252 | set { return; } |
253 | } | 253 | } |
254 | 254 | ||
@@ -296,9 +296,9 @@ namespace OpenSim.Region.Physics.Manager | |||
296 | set { return; } | 296 | set { return; } |
297 | } | 297 | } |
298 | 298 | ||
299 | public override PhysicsVector Size | 299 | public override Vector3 Size |
300 | { | 300 | { |
301 | get { return PhysicsVector.Zero; } | 301 | get { return Vector3.Zero; } |
302 | set { return; } | 302 | set { return; } |
303 | } | 303 | } |
304 | 304 | ||
@@ -307,9 +307,9 @@ namespace OpenSim.Region.Physics.Manager | |||
307 | get { return 0f; } | 307 | get { return 0f; } |
308 | } | 308 | } |
309 | 309 | ||
310 | public override PhysicsVector Force | 310 | public override Vector3 Force |
311 | { | 311 | { |
312 | get { return PhysicsVector.Zero; } | 312 | get { return Vector3.Zero; } |
313 | set { return; } | 313 | set { return; } |
314 | } | 314 | } |
315 | 315 | ||
@@ -324,7 +324,7 @@ namespace OpenSim.Region.Physics.Manager | |||
324 | 324 | ||
325 | } | 325 | } |
326 | 326 | ||
327 | public override void VehicleVectorParam(int param, PhysicsVector value) | 327 | public override void VehicleVectorParam(int param, Vector3 value) |
328 | { | 328 | { |
329 | 329 | ||
330 | } | 330 | } |
@@ -344,14 +344,14 @@ namespace OpenSim.Region.Physics.Manager | |||
344 | 344 | ||
345 | } | 345 | } |
346 | 346 | ||
347 | public override PhysicsVector CenterOfMass | 347 | public override Vector3 CenterOfMass |
348 | { | 348 | { |
349 | get { return PhysicsVector.Zero; } | 349 | get { return Vector3.Zero; } |
350 | } | 350 | } |
351 | 351 | ||
352 | public override PhysicsVector GeometricCenter | 352 | public override Vector3 GeometricCenter |
353 | { | 353 | { |
354 | get { return PhysicsVector.Zero; } | 354 | get { return Vector3.Zero; } |
355 | } | 355 | } |
356 | 356 | ||
357 | public override PrimitiveBaseShape Shape | 357 | public override PrimitiveBaseShape Shape |
@@ -359,15 +359,15 @@ namespace OpenSim.Region.Physics.Manager | |||
359 | set { return; } | 359 | set { return; } |
360 | } | 360 | } |
361 | 361 | ||
362 | public override PhysicsVector Velocity | 362 | public override Vector3 Velocity |
363 | { | 363 | { |
364 | get { return PhysicsVector.Zero; } | 364 | get { return Vector3.Zero; } |
365 | set { return; } | 365 | set { return; } |
366 | } | 366 | } |
367 | 367 | ||
368 | public override PhysicsVector Torque | 368 | public override Vector3 Torque |
369 | { | 369 | { |
370 | get { return PhysicsVector.Zero; } | 370 | get { return Vector3.Zero; } |
371 | set { return; } | 371 | set { return; } |
372 | } | 372 | } |
373 | 373 | ||
@@ -387,9 +387,9 @@ namespace OpenSim.Region.Physics.Manager | |||
387 | set { } | 387 | set { } |
388 | } | 388 | } |
389 | 389 | ||
390 | public override PhysicsVector Acceleration | 390 | public override Vector3 Acceleration |
391 | { | 391 | { |
392 | get { return PhysicsVector.Zero; } | 392 | get { return Vector3.Zero; } |
393 | } | 393 | } |
394 | 394 | ||
395 | public override bool IsPhysical | 395 | public override bool IsPhysical |
@@ -436,26 +436,26 @@ namespace OpenSim.Region.Physics.Manager | |||
436 | { | 436 | { |
437 | } | 437 | } |
438 | 438 | ||
439 | public override void LockAngularMotion(PhysicsVector axis) | 439 | public override void LockAngularMotion(Vector3 axis) |
440 | { | 440 | { |
441 | } | 441 | } |
442 | 442 | ||
443 | public override void AddForce(PhysicsVector force, bool pushforce) | 443 | public override void AddForce(Vector3 force, bool pushforce) |
444 | { | 444 | { |
445 | } | 445 | } |
446 | 446 | ||
447 | public override void AddAngularForce(PhysicsVector force, bool pushforce) | 447 | public override void AddAngularForce(Vector3 force, bool pushforce) |
448 | { | 448 | { |
449 | 449 | ||
450 | } | 450 | } |
451 | 451 | ||
452 | public override PhysicsVector RotationalVelocity | 452 | public override Vector3 RotationalVelocity |
453 | { | 453 | { |
454 | get { return PhysicsVector.Zero; } | 454 | get { return Vector3.Zero; } |
455 | set { return; } | 455 | set { return; } |
456 | } | 456 | } |
457 | 457 | ||
458 | public override PhysicsVector PIDTarget { set { return; } } | 458 | public override Vector3 PIDTarget { set { return; } } |
459 | public override bool PIDActive { set { return; } } | 459 | public override bool PIDActive { set { return; } } |
460 | public override float PIDTau { set { return; } } | 460 | public override float PIDTau { set { return; } } |
461 | 461 | ||
@@ -464,7 +464,7 @@ namespace OpenSim.Region.Physics.Manager | |||
464 | public override PIDHoverType PIDHoverType { set { return; } } | 464 | public override PIDHoverType PIDHoverType { set { return; } } |
465 | public override float PIDHoverTau { set { return; } } | 465 | public override float PIDHoverTau { set { return; } } |
466 | 466 | ||
467 | public override void SetMomentum(PhysicsVector momentum) | 467 | public override void SetMomentum(Vector3 momentum) |
468 | { | 468 | { |
469 | } | 469 | } |
470 | 470 | ||