diff options
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 6 |
2 files changed, 13 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. |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index c4d7ef3..290b72e 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -166,6 +166,12 @@ namespace OpenSim.Region.Physics.Manager | |||
166 | public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | 166 | public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, |
167 | Vector3 size, Quaternion rotation, bool isPhysical, uint localid); | 167 | Vector3 size, Quaternion rotation, bool isPhysical, uint localid); |
168 | 168 | ||
169 | public virtual PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | ||
170 | Vector3 size, Quaternion rotation, bool isPhysical, bool isPhantom, byte shapetype, uint localid) | ||
171 | { | ||
172 | return AddPrimShape(primName, pbs, position, size, rotation, isPhysical, localid); | ||
173 | } | ||
174 | |||
169 | public virtual float TimeDilation | 175 | public virtual float TimeDilation |
170 | { | 176 | { |
171 | get { return 1.0f; } | 177 | get { return 1.0f; } |