diff options
author | Melanie | 2013-02-07 23:22:00 +0000 |
---|---|---|
committer | Melanie | 2013-02-07 23:22:00 +0000 |
commit | 22675e6b14ce1b180f517c1ab92627d283192032 (patch) | |
tree | 4cf256430dc062f399c7ace49de3548477e00115 /OpenSim/Region/Physics/Manager/PhysicsActor.cs | |
parent | Plumb the path from the client to the extra physics params and back (diff) | |
download | opensim-SC-22675e6b14ce1b180f517c1ab92627d283192032.zip opensim-SC-22675e6b14ce1b180f517c1ab92627d283192032.tar.gz opensim-SC-22675e6b14ce1b180f517c1ab92627d283192032.tar.bz2 opensim-SC-22675e6b14ce1b180f517c1ab92627d283192032.tar.xz |
Add some more code from Avination. This changes physics actor stuff around
to work with the new params. Not actually plumbed just yet.
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsActor.cs')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index d119791..bd806eb 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -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. |