diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs b/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs index aaf90f2..98bfd1c 100644 --- a/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs +++ b/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs | |||
@@ -149,7 +149,7 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
149 | /// Collision geometry | 149 | /// Collision geometry |
150 | /// </summary> | 150 | /// </summary> |
151 | internal IntPtr Shell { get; private set; } | 151 | internal IntPtr Shell { get; private set; } |
152 | 152 | ||
153 | private IntPtr Amotor = IntPtr.Zero; | 153 | private IntPtr Amotor = IntPtr.Zero; |
154 | private d.Mass ShellMass; | 154 | private d.Mass ShellMass; |
155 | 155 | ||
@@ -237,7 +237,7 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
237 | m_tainted_isPhysical = true; // new tainted status: need to create ODE information | 237 | m_tainted_isPhysical = true; // new tainted status: need to create ODE information |
238 | 238 | ||
239 | _parent_scene.AddPhysicsActorTaint(this); | 239 | _parent_scene.AddPhysicsActorTaint(this); |
240 | 240 | ||
241 | Name = avName; | 241 | Name = avName; |
242 | } | 242 | } |
243 | 243 | ||
@@ -461,7 +461,7 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
461 | value.Z = _parent_scene.GetTerrainHeightAtXY(127, 127) + 5; | 461 | value.Z = _parent_scene.GetTerrainHeightAtXY(127, 127) + 5; |
462 | } | 462 | } |
463 | 463 | ||
464 | m_taintPosition = value; | 464 | m_taintPosition = value; |
465 | _parent_scene.AddPhysicsActorTaint(this); | 465 | _parent_scene.AddPhysicsActorTaint(this); |
466 | } | 466 | } |
467 | else | 467 | else |
@@ -796,7 +796,7 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
796 | internal void Move(List<OdeCharacter> defects) | 796 | internal void Move(List<OdeCharacter> defects) |
797 | { | 797 | { |
798 | // no lock; for now it's only called from within Simulate() | 798 | // no lock; for now it's only called from within Simulate() |
799 | 799 | ||
800 | // If the PID Controller isn't active then we set our force | 800 | // If the PID Controller isn't active then we set our force |
801 | // calculating base velocity to the current position | 801 | // calculating base velocity to the current position |
802 | 802 | ||
@@ -811,7 +811,7 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
811 | 811 | ||
812 | d.Vector3 localpos = d.BodyGetPosition(Body); | 812 | d.Vector3 localpos = d.BodyGetPosition(Body); |
813 | Vector3 localPos = new Vector3(localpos.X, localpos.Y, localpos.Z); | 813 | Vector3 localPos = new Vector3(localpos.X, localpos.Y, localpos.Z); |
814 | 814 | ||
815 | if (!localPos.IsFinite()) | 815 | if (!localPos.IsFinite()) |
816 | { | 816 | { |
817 | m_log.WarnFormat( | 817 | m_log.WarnFormat( |
@@ -1248,10 +1248,10 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
1248 | } | 1248 | } |
1249 | 1249 | ||
1250 | public override Vector3 PIDTarget { set { return; } } | 1250 | public override Vector3 PIDTarget { set { return; } } |
1251 | public override bool PIDActive | 1251 | public override bool PIDActive |
1252 | { | 1252 | { |
1253 | get { return false; } | 1253 | get { return false; } |
1254 | set { return; } | 1254 | set { return; } |
1255 | } | 1255 | } |
1256 | public override float PIDTau { set { return; } } | 1256 | public override float PIDTau { set { return; } } |
1257 | 1257 | ||
@@ -1259,7 +1259,7 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
1259 | public override bool PIDHoverActive {get {return false;} set { return; } } | 1259 | public override bool PIDHoverActive {get {return false;} set { return; } } |
1260 | public override PIDHoverType PIDHoverType { set { return; } } | 1260 | public override PIDHoverType PIDHoverType { set { return; } } |
1261 | public override float PIDHoverTau { set { return; } } | 1261 | public override float PIDHoverTau { set { return; } } |
1262 | 1262 | ||
1263 | public override Quaternion APIDTarget{ set { return; } } | 1263 | public override Quaternion APIDTarget{ set { return; } } |
1264 | 1264 | ||
1265 | public override bool APIDActive{ set { return; } } | 1265 | public override bool APIDActive{ set { return; } } |
@@ -1369,7 +1369,7 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
1369 | // m_log.DebugFormat( | 1369 | // m_log.DebugFormat( |
1370 | // "[ODE CHARACTER]: Changing capsule size from {0} to {1} for {2}", | 1370 | // "[ODE CHARACTER]: Changing capsule size from {0} to {1} for {2}", |
1371 | // CAPSULE_LENGTH, m_tainted_CAPSULE_LENGTH, Name); | 1371 | // CAPSULE_LENGTH, m_tainted_CAPSULE_LENGTH, Name); |
1372 | 1372 | ||
1373 | m_pidControllerActive = true; | 1373 | m_pidControllerActive = true; |
1374 | 1374 | ||
1375 | // no lock needed on _parent_scene.OdeLock because we are called from within the thread lock in OdePlugin's simulate() | 1375 | // no lock needed on _parent_scene.OdeLock because we are called from within the thread lock in OdePlugin's simulate() |