aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager/PhysicsScene.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs29
1 files changed, 28 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 2a6163c..f2c0c28 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -125,6 +125,25 @@ namespace OpenSim.Region.Physics.Manager
125 public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, 125 public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
126 Vector3 size, Quaternion rotation, bool isPhysical, uint localid); 126 Vector3 size, Quaternion rotation, bool isPhysical, uint localid);
127 127
128 public virtual PhysicsActor AddPrimShape(string primName, PhysicsActor parent, PrimitiveBaseShape pbs, Vector3 position,
129 uint localid, byte[] sdata)
130 {
131 return null;
132 }
133
134 public virtual PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
135 Vector3 size, Quaternion rotation, bool isPhysical, bool isPhantom, uint localid)
136 {
137 return AddPrimShape(primName, pbs, position, size, rotation, isPhysical, localid);
138 }
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
128 public virtual float TimeDilation 147 public virtual float TimeDilation
129 { 148 {
130 get { return 1.0f; } 149 get { return 1.0f; }
@@ -222,7 +241,7 @@ namespace OpenSim.Region.Physics.Manager
222 } 241 }
223 242
224 public virtual void Combine(PhysicsScene pScene, Vector3 offset, Vector3 extents) {} 243 public virtual void Combine(PhysicsScene pScene, Vector3 offset, Vector3 extents) {}
225 244 public virtual void CombineTerrain(float[] heightMap, Vector3 pOffset) {}
226 public virtual void UnCombine(PhysicsScene pScene) {} 245 public virtual void UnCombine(PhysicsScene pScene) {}
227 246
228 /// <summary> 247 /// <summary>
@@ -260,5 +279,13 @@ namespace OpenSim.Region.Physics.Manager
260 { 279 {
261 return new List<ContactResult>(); 280 return new List<ContactResult>();
262 } 281 }
282
283 public virtual void RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, RaycastCallback retMethod){}
284 public virtual void RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, int Count, RayCallback retMethod) { }
285 public virtual List<ContactResult> RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, int Count)
286 {
287 return new List<ContactResult>();
288 }
289
263 } 290 }
264} 291}