diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/PhysicsModules/SharedBase | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/PhysicsModules/SharedBase')
6 files changed, 23 insertions, 23 deletions
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/IMesher.cs b/OpenSim/Region/PhysicsModules/SharedBase/IMesher.cs index 88169bb..1a8409e 100644 --- a/OpenSim/Region/PhysicsModules/SharedBase/IMesher.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/IMesher.cs | |||
@@ -48,7 +48,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase | |||
48 | // Values for level of detail to be passed to the mesher. | 48 | // Values for level of detail to be passed to the mesher. |
49 | // Values origionally chosen for the LOD of sculpties (the sqrt(width*heigth) of sculpt texture) | 49 | // Values origionally chosen for the LOD of sculpties (the sqrt(width*heigth) of sculpt texture) |
50 | // Lower level of detail reduces the number of vertices used to represent the meshed shape. | 50 | // Lower level of detail reduces the number of vertices used to represent the meshed shape. |
51 | public enum LevelOfDetail | 51 | public enum LevelOfDetail |
52 | { | 52 | { |
53 | High = 32, | 53 | High = 32, |
54 | Medium = 16, | 54 | Medium = 16, |
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs b/OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs index 432708c..8079e79 100644 --- a/OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs | |||
@@ -37,7 +37,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase | |||
37 | class NullPhysicsScene : PhysicsScene | 37 | class NullPhysicsScene : PhysicsScene |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
40 | 40 | ||
41 | private static int m_workIndicator; | 41 | private static int m_workIndicator; |
42 | 42 | ||
43 | public override PhysicsActor AddAvatar( | 43 | public override PhysicsActor AddAvatar( |
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) { } |
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs index aa51c4e..e8d6334 100644 --- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs | |||
@@ -179,7 +179,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase | |||
179 | public virtual PhysicsActor AddAvatar( | 179 | public virtual PhysicsActor AddAvatar( |
180 | uint localID, string avName, Vector3 position, Vector3 size, bool isFlying) | 180 | uint localID, string avName, Vector3 position, Vector3 size, bool isFlying) |
181 | { | 181 | { |
182 | PhysicsActor ret = AddAvatar(localID, avName, position, Vector3.Zero, size, isFlying); | 182 | PhysicsActor ret = AddAvatar(localID, avName, position, Vector3.Zero, size, isFlying); |
183 | return ret; | 183 | return ret; |
184 | } | 184 | } |
185 | 185 | ||
@@ -217,7 +217,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase | |||
217 | return AddPrimShape(primName, pbs, position, size, rotation, isPhysical, localid); | 217 | return AddPrimShape(primName, pbs, position, size, rotation, isPhysical, localid); |
218 | } | 218 | } |
219 | 219 | ||
220 | 220 | ||
221 | public virtual PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | 221 | public virtual PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, |
222 | Vector3 size, Quaternion rotation, bool isPhysical, bool isPhantom, byte shapetype, uint localid) | 222 | Vector3 size, Quaternion rotation, bool isPhysical, bool isPhantom, byte shapetype, uint localid) |
223 | { | 223 | { |
@@ -335,16 +335,16 @@ namespace OpenSim.Region.PhysicsModules.SharedBase | |||
335 | /// <summary> | 335 | /// <summary> |
336 | /// Queue a raycast against the physics scene. | 336 | /// Queue a raycast against the physics scene. |
337 | /// The provided callback method will be called when the raycast is complete | 337 | /// The provided callback method will be called when the raycast is complete |
338 | /// | 338 | /// |
339 | /// Many physics engines don't support collision testing at the same time as | 339 | /// Many physics engines don't support collision testing at the same time as |
340 | /// manipulating the physics scene, so we queue the request up and callback | 340 | /// manipulating the physics scene, so we queue the request up and callback |
341 | /// a custom method when the raycast is complete. | 341 | /// a custom method when the raycast is complete. |
342 | /// This allows physics engines that give an immediate result to callback immediately | 342 | /// This allows physics engines that give an immediate result to callback immediately |
343 | /// and ones that don't, to callback when it gets a result back. | 343 | /// and ones that don't, to callback when it gets a result back. |
344 | /// | 344 | /// |
345 | /// ODE for example will not allow you to change the scene while collision testing or | 345 | /// ODE for example will not allow you to change the scene while collision testing or |
346 | /// it asserts, 'opteration not valid for locked space'. This includes adding a ray to the scene. | 346 | /// it asserts, 'opteration not valid for locked space'. This includes adding a ray to the scene. |
347 | /// | 347 | /// |
348 | /// This is named RayCastWorld to not conflict with modrex's Raycast method. | 348 | /// This is named RayCastWorld to not conflict with modrex's Raycast method. |
349 | /// </summary> | 349 | /// </summary> |
350 | /// <param name="position">Origin of the ray</param> | 350 | /// <param name="position">Origin of the ray</param> |
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsVector.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsVector.cs index 76a82fa..5aae42f 100644 --- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsVector.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsVector.cs | |||
@@ -49,7 +49,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase | |||
49 | public Vector3(Vector3 pv) : this(pv.X, pv.Y, pv.Z) | 49 | public Vector3(Vector3 pv) : this(pv.X, pv.Y, pv.Z) |
50 | { | 50 | { |
51 | } | 51 | } |
52 | 52 | ||
53 | public void setValues(float x, float y, float z) | 53 | public void setValues(float x, float y, float z) |
54 | { | 54 | { |
55 | X = x; | 55 | X = x; |
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/VehicleConstants.cs b/OpenSim/Region/PhysicsModules/SharedBase/VehicleConstants.cs index e850b11..0b4c8c6 100644 --- a/OpenSim/Region/PhysicsModules/SharedBase/VehicleConstants.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/VehicleConstants.cs | |||
@@ -38,7 +38,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase | |||
38 | TYPE_NONE = 0, | 38 | TYPE_NONE = 0, |
39 | 39 | ||
40 | /// <summary> | 40 | /// <summary> |
41 | /// No Angular motor, High Left right friction, No Hover, Linear Deflection 1, no angular deflection | 41 | /// No Angular motor, High Left right friction, No Hover, Linear Deflection 1, no angular deflection |
42 | /// no vertical attractor, No banking, Identity rotation frame | 42 | /// no vertical attractor, No banking, Identity rotation frame |
43 | /// </summary> | 43 | /// </summary> |
44 | TYPE_SLED = 1, | 44 | TYPE_SLED = 1, |