1 files changed, 67 insertions, 104 deletions

diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 217d307..514d9ad 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -37,10 +37,31 @@ namespace OpenSim.Region.Physics.Manager
     public delegate void physicsCrash();
 
     public delegate void RaycastCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 normal);
+    public delegate void RayCallback(List<ContactResult> list);
+
+    public delegate void JointMoved(PhysicsJoint joint);
+    public delegate void JointDeactivated(PhysicsJoint joint);
+    public delegate void JointErrorMessage(PhysicsJoint joint, string message); // this refers to an "error message due to a problem", not "amount of joint constraint violation"
+
+    /// <summary>
+    /// Contact result from a raycast.
+    /// </summary>
+    public struct ContactResult
+    {
+        public Vector3 Pos;
+        public float Depth;
+        public uint ConsumerID;
+        public Vector3 Normal;
+    }
 
     public abstract class PhysicsScene
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        /// <summary>
+        /// Name of this scene.  Useful in debug messages to distinguish one OdeScene instance from another.
+        /// </summary>
+        public string Name { get; protected set; }
 
         // The only thing that should register for this event is the SceneGraph
         // Anything else could cause problems.
@@ -61,19 +82,51 @@ namespace OpenSim.Region.Physics.Manager
             }
         }
 
-
         public abstract void Initialise(IMesher meshmerizer, IConfigSource config);
 
+        /// <summary>
+        /// Add an avatar
+        /// </summary>
+        /// <param name="avName"></param>
+        /// <param name="position"></param>
+        /// <param name="size"></param>
+        /// <param name="isFlying"></param>
+        /// <returns></returns>
         public abstract PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying);
 
+        /// <summary>
+        /// Add an avatar
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <param name="avName"></param>
+        /// <param name="position"></param>
+        /// <param name="size"></param>
+        /// <param name="isFlying"></param>
+        /// <returns></returns>
+        public virtual PhysicsActor AddAvatar(uint localID, string avName, Vector3 position, Vector3 size, bool isFlying)
+        {
+            PhysicsActor ret = AddAvatar(avName, position, size, isFlying);
+            if (ret != null) ret.LocalID = localID;
+            return ret;
+        }
+
+        /// <summary>
+        /// Remove an avatar.
+        /// </summary>
+        /// <param name="actor"></param>
         public abstract void RemoveAvatar(PhysicsActor actor);
 
+        /// <summary>
+        /// Remove a prim.
+        /// </summary>
+        /// <param name="prim"></param>
         public abstract void RemovePrim(PhysicsActor prim);
 
+        //public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
+        //                                          Vector3 size, Quaternion rotation); //To be removed - Actually removed!
+
         public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
-                                                  Vector3 size, Quaternion rotation); //To be removed
-        public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
-                                                  Vector3 size, Quaternion rotation, bool isPhysical);
+                                                  Vector3 size, Quaternion rotation, bool isPhysical, uint localid);
 
         public virtual float TimeDilation
         {
@@ -140,7 +193,6 @@ namespace OpenSim.Region.Physics.Manager
         public virtual Vector3 GetJointAxis(PhysicsJoint joint)
         { return Vector3.Zero; }
 
-
         public abstract void AddPhysicsActorTaint(PhysicsActor prim);
 
         public abstract float Simulate(float timeStep);
@@ -172,15 +224,9 @@ namespace OpenSim.Region.Physics.Manager
             return false;
         }
 
-        public virtual void Combine(PhysicsScene pScene, Vector3 offset, Vector3 extents)
-        {
-            return;
-        }
+        public virtual void Combine(PhysicsScene pScene, Vector3 offset, Vector3 extents) {}
 
-        public virtual void UnCombine(PhysicsScene pScene)
-        {
-            
-        }
+        public virtual void UnCombine(PhysicsScene pScene) {}
 
         /// <summary>
         /// Queue a raycast against the physics scene.
@@ -207,98 +253,15 @@ namespace OpenSim.Region.Physics.Manager
                 retMethod(false, Vector3.Zero, 0, 999999999999f, Vector3.Zero);
         }
 
-        private class NullPhysicsScene : PhysicsScene
+        public virtual void RaycastWorld(Vector3 position, Vector3 direction, float length, int Count, RayCallback retMethod)
         {
-            private static int m_workIndicator;
-
-
-            public override void Initialise(IMesher meshmerizer, IConfigSource config)
-            {
-                // Does nothing right now
-            }
-
-            public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying)
-            {
-                m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : AddAvatar({0})", position);
-                return PhysicsActor.Null;
-            }
-
-            public override void RemoveAvatar(PhysicsActor actor)
-            {
-            }
-
-            public override void RemovePrim(PhysicsActor prim)
-            {
-            }
-            public override void SetWaterLevel(float baseheight)
-            {
-
-            }
-
-/*
-            public override PhysicsActor AddPrim(Vector3 position, Vector3 size, Quaternion rotation)
-            {
-                m_log.InfoFormat("NullPhysicsScene : AddPrim({0},{1})", position, size);
-                return PhysicsActor.Null;
-            }
-*/
-
-            public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
-                                                      Vector3 size, Quaternion rotation) //To be removed
-            {
-                return AddPrimShape(primName, pbs, position, size, rotation, false);
-            }
-
-            public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
-                                                      Vector3 size, Quaternion rotation, bool isPhysical)
-            {
-                m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : AddPrim({0},{1})", position, size);
-                return PhysicsActor.Null;
-            }
-
-            public override void AddPhysicsActorTaint(PhysicsActor prim)
-            {
-            }
-
-            public override float Simulate(float timeStep)
-            {
-                m_workIndicator = (m_workIndicator + 1) % 10;
-
-                return 0f;
-            }
-
-            public override void GetResults()
-            {
-                m_log.Info("[PHYSICS]: NullPhysicsScene : GetResults()");
-            }
-
-            public override void SetTerrain(float[] heightMap)
-            {
-                m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
-            }
-
-            public override void DeleteTerrain()
-            {
-            }
-
-            public override bool IsThreaded
-            {
-                get { return false; }
-            }
-
-            public override void Dispose()
-            {
-            }
+            if (retMethod != null)
+                retMethod(new List<ContactResult>());
+        }
 
-            public override Dictionary<uint,float> GetTopColliders()
-            {
-                Dictionary<uint, float> returncolliders = new Dictionary<uint, float>();
-                return returncolliders;
-            }
-            
+        public virtual List<ContactResult> RaycastWorld(Vector3 position, Vector3 direction, float length, int Count)
+        {
+            return new List<ContactResult>();
         }
     }
-    public delegate void JointMoved(PhysicsJoint joint);
-    public delegate void JointDeactivated(PhysicsJoint joint);
-    public delegate void JointErrorMessage(PhysicsJoint joint, string message); // this refers to an "error message due to a problem", not "amount of joint constraint violation"
 }