aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager/PhysicsScene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsScene.cs')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs16
1 files changed, 15 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 514d9ad..0346d4e 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -128,6 +128,12 @@ namespace OpenSim.Region.Physics.Manager
128 public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, 128 public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
129 Vector3 size, Quaternion rotation, bool isPhysical, uint localid); 129 Vector3 size, Quaternion rotation, bool isPhysical, uint localid);
130 130
131 public virtual PhysicsActor AddPrimShape(string primName, PhysicsActor parent, PrimitiveBaseShape pbs, Vector3 position,
132 uint localid, byte[] sdata)
133 {
134 return null;
135 }
136
131 public virtual float TimeDilation 137 public virtual float TimeDilation
132 { 138 {
133 get { return 1.0f; } 139 get { return 1.0f; }
@@ -225,7 +231,7 @@ namespace OpenSim.Region.Physics.Manager
225 } 231 }
226 232
227 public virtual void Combine(PhysicsScene pScene, Vector3 offset, Vector3 extents) {} 233 public virtual void Combine(PhysicsScene pScene, Vector3 offset, Vector3 extents) {}
228 234 public virtual void CombineTerrain(float[] heightMap, Vector3 pOffset) {}
229 public virtual void UnCombine(PhysicsScene pScene) {} 235 public virtual void UnCombine(PhysicsScene pScene) {}
230 236
231 /// <summary> 237 /// <summary>
@@ -263,5 +269,13 @@ namespace OpenSim.Region.Physics.Manager
263 { 269 {
264 return new List<ContactResult>(); 270 return new List<ContactResult>();
265 } 271 }
272
273 public virtual void RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, RaycastCallback retMethod){}
274 public virtual void RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, int Count, RayCallback retMethod) { }
275 public virtual List<ContactResult> RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, int Count)
276 {
277 return new List<ContactResult>();
278 }
279
266 } 280 }
267} 281}