diff options
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index bd80fff..be67204 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -172,6 +172,8 @@ namespace OpenSim.Region.Physics.Manager | |||
172 | 172 | ||
173 | public virtual bool Phantom { get; set; } | 173 | public virtual bool Phantom { get; set; } |
174 | 174 | ||
175 | public virtual byte PhysicsShapeType { get; set; } | ||
176 | |||
175 | public abstract PrimitiveBaseShape Shape { set; } | 177 | public abstract PrimitiveBaseShape Shape { set; } |
176 | 178 | ||
177 | uint m_baseLocalID; | 179 | uint m_baseLocalID; |
@@ -252,6 +254,11 @@ namespace OpenSim.Region.Physics.Manager | |||
252 | { | 254 | { |
253 | } | 255 | } |
254 | 256 | ||
257 | public virtual float Density { get; set; } | ||
258 | public virtual float GravModifier { get; set; } | ||
259 | public virtual float Friction { get; set; } | ||
260 | public virtual float Bounce { get; set; } | ||
261 | |||
255 | /// <summary> | 262 | /// <summary> |
256 | /// Position of this actor. | 263 | /// Position of this actor. |
257 | /// </summary> | 264 | /// </summary> |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index eca6a0f..f2c0c28 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -137,6 +137,13 @@ namespace OpenSim.Region.Physics.Manager | |||
137 | return AddPrimShape(primName, pbs, position, size, rotation, isPhysical, localid); | 137 | return AddPrimShape(primName, pbs, position, size, rotation, isPhysical, localid); |
138 | } | 138 | } |
139 | 139 | ||
140 | |||
141 | public virtual PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | ||
142 | Vector3 size, Quaternion rotation, bool isPhysical, bool isPhantom, byte shapetype, uint localid) | ||
143 | { | ||
144 | return AddPrimShape(primName, pbs, position, size, rotation, isPhysical, localid); | ||
145 | } | ||
146 | |||
140 | public virtual float TimeDilation | 147 | public virtual float TimeDilation |
141 | { | 148 | { |
142 | get { return 1.0f; } | 149 | get { return 1.0f; } |