aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-05 19:07:37 +0000
committerMelanie Thielker2017-01-05 19:07:37 +0000
commitb16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch)
tree6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs
parentMake it possible to disable the bakes module in the way it is described in co... (diff)
downloadopensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs')
-rw-r--r--OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs24
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs
index 250b155..33f0337 100644
--- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs
+++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs
@@ -134,8 +134,8 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
134 m_objCollisionList.Add(localID, contact); 134 m_objCollisionList.Add(localID, contact);
135 } 135 }
136 else 136 else
137 { 137 {
138 float lastVel = m_objCollisionList[localID].RelativeSpeed; 138 float lastVel = m_objCollisionList[localID].RelativeSpeed;
139 if (m_objCollisionList[localID].PenetrationDepth < contact.PenetrationDepth) 139 if (m_objCollisionList[localID].PenetrationDepth < contact.PenetrationDepth)
140 { 140 {
141 if(Math.Abs(lastVel) > Math.Abs(contact.RelativeSpeed)) 141 if(Math.Abs(lastVel) > Math.Abs(contact.RelativeSpeed))
@@ -201,7 +201,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
201 { 201 {
202 get { return new NullPhysicsActor(); } 202 get { return new NullPhysicsActor(); }
203 } 203 }
204 204
205 public virtual bool Building { get; set; } 205 public virtual bool Building { get; set; }
206 206
207 public virtual void getContactData(ref ContactData cdata) 207 public virtual void getContactData(ref ContactData cdata)
@@ -263,7 +263,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
263 public abstract void delink(); 263 public abstract void delink();
264 264
265 public abstract void LockAngularMotion(byte axislocks); 265 public abstract void LockAngularMotion(byte axislocks);
266 266
267 public virtual void RequestPhysicsterseUpdate() 267 public virtual void RequestPhysicsterseUpdate()
268 { 268 {
269 // Make a temporary copy of the event to avoid possibility of 269 // Make a temporary copy of the event to avoid possibility of
@@ -326,7 +326,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
326 public abstract void VehicleFlags(int param, bool remove); 326 public abstract void VehicleFlags(int param, bool remove);
327 327
328 // This is an overridable version of SetVehicle() that works for all physics engines. 328 // This is an overridable version of SetVehicle() that works for all physics engines.
329 // This is VERY inefficient. It behoves any physics engine to override this and 329 // This is VERY inefficient. It behoves any physics engine to override this and
330 // implement a more efficient setting of all the vehicle parameters. 330 // implement a more efficient setting of all the vehicle parameters.
331 public virtual void SetVehicle(object pvdata) 331 public virtual void SetVehicle(object pvdata)
332 { 332 {
@@ -453,7 +453,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
453 public abstract bool APIDActive { set;} 453 public abstract bool APIDActive { set;}
454 public abstract float APIDStrength { set;} 454 public abstract float APIDStrength { set;}
455 public abstract float APIDDamping { set;} 455 public abstract float APIDDamping { set;}
456 456
457 public abstract void AddForce(Vector3 force, bool pushforce); 457 public abstract void AddForce(Vector3 force, bool pushforce);
458 public abstract void AddAngularForce(Vector3 force, bool pushforce); 458 public abstract void AddAngularForce(Vector3 force, bool pushforce);
459 public abstract void SetMomentum(Vector3 momentum); 459 public abstract void SetMomentum(Vector3 momentum);
@@ -465,7 +465,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
465 465
466 // Warning in a parent part it returns itself, not null 466 // Warning in a parent part it returns itself, not null
467 public virtual PhysicsActor ParentActor { get { return this; } } 467 public virtual PhysicsActor ParentActor { get { return this; } }
468 468
469 469
470 // Extendable interface for new, physics engine specific operations 470 // Extendable interface for new, physics engine specific operations
471 public virtual object Extension(string pFunct, params object[] pParams) 471 public virtual object Extension(string pFunct, params object[] pParams)
@@ -629,7 +629,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
629 public override int PhysicsActorType 629 public override int PhysicsActorType
630 { 630 {
631 get { return (int)m_actorType; } 631 get { return (int)m_actorType; }
632 set { 632 set {
633 ActorTypes type = (ActorTypes)value; 633 ActorTypes type = (ActorTypes)value;
634 switch (type) 634 switch (type)
635 { 635 {
@@ -664,10 +664,10 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
664 664
665 public override Vector3 PIDTarget { set { return; } } 665 public override Vector3 PIDTarget { set { return; } }
666 666
667 public override bool PIDActive 667 public override bool PIDActive
668 { 668 {
669 get { return false; } 669 get { return false; }
670 set { return; } 670 set { return; }
671 } 671 }
672 672
673 public override float PIDTau { set { return; } } 673 public override float PIDTau { set { return; } }
@@ -676,12 +676,12 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
676 public override bool PIDHoverActive {get {return false;} set { return; } } 676 public override bool PIDHoverActive {get {return false;} set { return; } }
677 public override PIDHoverType PIDHoverType { set { return; } } 677 public override PIDHoverType PIDHoverType { set { return; } }
678 public override float PIDHoverTau { set { return; } } 678 public override float PIDHoverTau { set { return; } }
679 679
680 public override Quaternion APIDTarget { set { return; } } 680 public override Quaternion APIDTarget { set { return; } }
681 public override bool APIDActive { set { return; } } 681 public override bool APIDActive { set { return; } }
682 public override float APIDStrength { set { return; } } 682 public override float APIDStrength { set { return; } }
683 public override float APIDDamping { set { return; } } 683 public override float APIDDamping { set { return; } }
684 684
685 public override void SetMomentum(Vector3 momentum) { } 685 public override void SetMomentum(Vector3 momentum) { }
686 686
687 public override void SubscribeEvents(int ms) { } 687 public override void SubscribeEvents(int ms) { }