From c75fa8b8a1c4ba9235074e84f9a363483c5220f7 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 8 Feb 2012 15:28:13 +0000
Subject:  changes in physics manager, needed for UbitODE

---
 OpenSim/Region/Physics/Manager/PhysicsScene.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Physics/Manager/PhysicsScene.cs')

diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 514d9ad..3db71e5 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -225,7 +225,7 @@ namespace OpenSim.Region.Physics.Manager
         }
 
         public virtual void Combine(PhysicsScene pScene, Vector3 offset, Vector3 extents) {}
-
+        public virtual void CombineTerrain(float[] heightMap, Vector3 pOffset) {}
         public virtual void UnCombine(PhysicsScene pScene) {}
 
         /// <summary>
@@ -263,5 +263,13 @@ namespace OpenSim.Region.Physics.Manager
         {
             return new List<ContactResult>();
         }
+
+        public virtual void RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, RaycastCallback retMethod){}
+        public virtual void RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, int Count, RayCallback retMethod) { }
+        public virtual List<ContactResult> RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, int Count)
+        {
+            return new List<ContactResult>();
+        }
+
     }
 }
-- 
cgit v1.1


From 7d77ccc6593c6c3ac9f66e2e593dfb8cc719cd04 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Fri, 17 Feb 2012 21:09:00 +0000
Subject: Added simple binary serializer/deserializer to chODE. 100% untested
 and most like still broken

---
 OpenSim/Region/Physics/Manager/PhysicsScene.cs | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'OpenSim/Region/Physics/Manager/PhysicsScene.cs')

diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 3db71e5..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
         public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
                                                   Vector3 size, Quaternion rotation, bool isPhysical, uint localid);
 
+        public virtual PhysicsActor AddPrimShape(string primName, PhysicsActor parent, PrimitiveBaseShape pbs, Vector3 position,
+                                                  uint localid, byte[] sdata)
+        {
+            return null;
+        }
+
         public virtual float TimeDilation
         {
             get { return 1.0f; }
-- 
cgit v1.1