From 27508c1ad87786935dbf28aa217bcbe55a9aa645 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sat, 23 Feb 2008 11:42:55 +0000
Subject: * Added Support within the ODEPlugin for Selected.  Which means that;
 * When you select a physical prim, it stops while you've got it selected. *
 When you move or alter a prim in some manner, it doesn't become collidable
 until you de-select it * When you select a prim, it doesn't become
 temporarily 'phantom' until you make some change to it while it's selected.
 (this prevents accidental selections in prim floor from causing it to go
 phantom on you(but don't move it or you'll fall)) * There's one major
 difference, and that's a physical object won't stop if you don't have
 permission to edit it.  This prevents people who don't have edit permissions
 on a prim from stopping it while it's moving.

---
 OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'OpenSim/Region/Physics/OdePlugin/OdePlugin.cs')

diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index b3780fd..76bd3f2 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -78,6 +78,21 @@ namespace OpenSim.Region.Physics.OdePlugin
         }
     }
 
+    [Flags]
+    public enum CollisionCategories : int
+    {
+        Disabled = 0,
+        Geom = 0x00000001,
+        Body = 0x00000002,
+        Space = 0x00000004,
+        Character = 0x00000008,
+        Land = 0x00000010,
+        Water = 0x00000020,
+        Wind = 0x00000040,
+        Sensor = 0x00000080,
+        Selected = 0x00000100
+    }
+
     public class OdeScene : PhysicsScene
     {
         private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
@@ -997,6 +1012,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         {
             // creating a new space for prim and inserting it into main space.
             staticPrimspace[iprimspaceArrItemX, iprimspaceArrItemY] = d.HashSpaceCreate(IntPtr.Zero);
+            d.GeomSetCategoryBits(staticPrimspace[iprimspaceArrItemX, iprimspaceArrItemY], (int)CollisionCategories.Space);
             waitForSpaceUnlock(space);
             d.SpaceAdd(space, staticPrimspace[iprimspaceArrItemX, iprimspaceArrItemY]);
             return staticPrimspace[iprimspaceArrItemX, iprimspaceArrItemY];
@@ -1656,6 +1672,12 @@ namespace OpenSim.Region.Physics.OdePlugin
                                                  offset, thickness, wrap);
                 d.GeomHeightfieldDataSetBounds(HeightmapData, m_regionWidth, m_regionHeight);
                 LandGeom = d.CreateHeightfield(space, HeightmapData, 1);
+                if (LandGeom != (IntPtr)0)
+                {
+                    d.GeomSetCategoryBits(LandGeom, (int)(CollisionCategories.Land));
+                    d.GeomSetCollideBits(LandGeom, (int)(CollisionCategories.Space));
+
+                }
                 geom_name_map[LandGeom] = "Terrain";
 
                 d.Matrix3 R = new d.Matrix3();
-- 
cgit v1.1