diff options
author | David Walter Seikel | 2016-11-03 21:44:39 +1000 |
---|---|---|
committer | David Walter Seikel | 2016-11-03 21:44:39 +1000 |
commit | 134f86e8d5c414409631b25b8c6f0ee45fbd8631 (patch) | |
tree | 216b89d3fb89acfb81be1e440c25c41ab09fa96d /OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs | |
parent | More changing to production grid. Double oops. (diff) | |
download | opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.zip opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.gz opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.bz2 opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.xz |
Initial update to OpenSim 0.8.2.1 source code.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs (renamed from OpenSim/Region/Physics/Manager/PhysicsActor.cs) | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs index d119791..c04ff58 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs | |||
@@ -32,7 +32,7 @@ using System.Reflection; | |||
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenMetaverse; | 33 | using OpenMetaverse; |
34 | 34 | ||
35 | namespace OpenSim.Region.Physics.Manager | 35 | namespace OpenSim.Region.PhysicsModules.SharedBase |
36 | { | 36 | { |
37 | public delegate void PositionUpdate(Vector3 position); | 37 | public delegate void PositionUpdate(Vector3 position); |
38 | public delegate void VelocityUpdate(Vector3 velocity); | 38 | public delegate void VelocityUpdate(Vector3 velocity); |
@@ -147,6 +147,8 @@ namespace OpenSim.Region.Physics.Manager | |||
147 | 147 | ||
148 | public abstract Vector3 Size { get; set; } | 148 | public abstract Vector3 Size { get; set; } |
149 | 149 | ||
150 | public virtual byte PhysicsShapeType { get; set; } | ||
151 | |||
150 | public abstract PrimitiveBaseShape Shape { set; } | 152 | public abstract PrimitiveBaseShape Shape { set; } |
151 | 153 | ||
152 | uint m_baseLocalID; | 154 | uint m_baseLocalID; |
@@ -218,9 +220,11 @@ namespace OpenSim.Region.Physics.Manager | |||
218 | handler(e); | 220 | handler(e); |
219 | } | 221 | } |
220 | 222 | ||
221 | public virtual void SetMaterial (int material) | 223 | public virtual void SetMaterial (int material) { } |
222 | { | 224 | public virtual float Density { get; set; } |
223 | } | 225 | public virtual float GravModifier { get; set; } |
226 | public virtual float Friction { get; set; } | ||
227 | public virtual float Restitution { get; set; } | ||
224 | 228 | ||
225 | /// <summary> | 229 | /// <summary> |
226 | /// Position of this actor. | 230 | /// Position of this actor. |
@@ -287,7 +291,7 @@ namespace OpenSim.Region.Physics.Manager | |||
287 | 291 | ||
288 | // Used for MoveTo | 292 | // Used for MoveTo |
289 | public abstract Vector3 PIDTarget { set; } | 293 | public abstract Vector3 PIDTarget { set; } |
290 | public abstract bool PIDActive { set;} | 294 | public abstract bool PIDActive { get; set; } |
291 | public abstract float PIDTau { set; } | 295 | public abstract float PIDTau { set; } |
292 | 296 | ||
293 | // Used for llSetHoverHeight and maybe vehicle height | 297 | // Used for llSetHoverHeight and maybe vehicle height |
@@ -309,6 +313,13 @@ namespace OpenSim.Region.Physics.Manager | |||
309 | public abstract void SubscribeEvents(int ms); | 313 | public abstract void SubscribeEvents(int ms); |
310 | public abstract void UnSubscribeEvents(); | 314 | public abstract void UnSubscribeEvents(); |
311 | public abstract bool SubscribedEvents(); | 315 | public abstract bool SubscribedEvents(); |
316 | |||
317 | // Extendable interface for new, physics engine specific operations | ||
318 | public virtual object Extension(string pFunct, params object[] pParams) | ||
319 | { | ||
320 | // A NOP of the physics engine does not implement this feature | ||
321 | return null; | ||
322 | } | ||
312 | } | 323 | } |
313 | 324 | ||
314 | public class NullPhysicsActor : PhysicsActor | 325 | public class NullPhysicsActor : PhysicsActor |
@@ -534,7 +545,13 @@ namespace OpenSim.Region.Physics.Manager | |||
534 | } | 545 | } |
535 | 546 | ||
536 | public override Vector3 PIDTarget { set { return; } } | 547 | public override Vector3 PIDTarget { set { return; } } |
537 | public override bool PIDActive { set { return; } } | 548 | |
549 | public override bool PIDActive | ||
550 | { | ||
551 | get { return false; } | ||
552 | set { return; } | ||
553 | } | ||
554 | |||
538 | public override float PIDTau { set { return; } } | 555 | public override float PIDTau { set { return; } } |
539 | 556 | ||
540 | public override float PIDHoverHeight { set { return; } } | 557 | public override float PIDHoverHeight { set { return; } } |