1 files changed, 124 insertions, 25 deletions

diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
index f2f4725..7650571 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
@@ -104,9 +104,6 @@ namespace OpenSim.Region.Physics.OdePlugin
         private float m_PIDTau;

         private bool m_usePID;

 

-        // KF: These next 7 params apply to llSetHoverHeight(float height, integer water, float tau),

-        // and are for non-VEHICLES only.

-

         private float m_PIDHoverHeight;

         private float m_PIDHoverTau;

         private bool m_useHoverPID;

@@ -395,6 +392,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                 if (value.IsFinite())

                 {

                     AddChange(changes.Size, value);

+

+//                    _parent_scene.m_meshWorker.ChangeActorPhysRep(this, _pbs, value, m_shapetype, MeshWorkerChange.size);

                 }

                 else

                 {

@@ -529,6 +528,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             set

             {

                 AddChange(changes.Shape, value);

+//                _parent_scene.m_meshWorker.ChangeActorPhysRep(this, value, _size, m_shapetype, MeshWorkerChange.shape);

             }

         }

 

@@ -542,10 +542,10 @@ namespace OpenSim.Region.Physics.OdePlugin
             {

                 m_shapetype = value;

                 AddChange(changes.Shape, null);

+//                _parent_scene.m_meshWorker.ChangeActorPhysRep(this, _pbs, _size, value, MeshWorkerChange.shapetype);

             }

         }

 

-

         public override Vector3 Velocity

         {

             get

@@ -1080,7 +1080,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             bounce = parent_scene.m_materialContactsData[(int)Material.Wood].bounce;

 

             CalcPrimBodyData();

-

+/*

             m_mesh = null;

             if (_parent_scene.needsMeshing(pbs) && (pbs.SculptData.Length > 0))

             {

@@ -1096,6 +1096,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                 }

                 m_mesh = _parent_scene.mesher.CreateMesh(Name, _pbs, _size, clod, true, convex);

             }

+*/

+            m_mesh = _parent_scene.m_meshWorker.getMesh(this, pbs, _size, m_shapetype);

 

             m_building = true; // control must set this to false when done

 

@@ -1351,6 +1353,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             {

                 if (m_mesh == null)

                 {

+/*

                     bool convex;

                     int clod = (int)LevelOfDetail.High;

 

@@ -1364,6 +1367,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                     }

 

                     mesh = _parent_scene.mesher.CreateMesh(Name, _pbs, _size, clod, true, convex);

+*/

+                    mesh = _parent_scene.m_meshWorker.getMesh(this, _pbs, _size, m_shapetype);

                 }

                 else

                 {

@@ -1476,7 +1481,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             hasOOBoffsetFromMesh = false;

             m_NoColide = false;

 

-            if (_parent_scene.needsMeshing(_pbs))

+            if (_parent_scene.m_meshWorker.needsMeshing(_pbs))

             {

                 haveMesh = setMesh(_parent_scene); // this will give a mesh to non trivial known prims

                 if (!haveMesh)

@@ -1524,7 +1529,6 @@ namespace OpenSim.Region.Physics.OdePlugin
         {

             if (prim_geom != IntPtr.Zero)

             {

-//                _parent_scene.geom_name_map.Remove(prim_geom);

                 _parent_scene.actor_name_map.Remove(prim_geom);

                 try

                 {

@@ -1534,11 +1538,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                         d.GeomTriMeshDataDestroy(_triMeshData);

                         _triMeshData = IntPtr.Zero;

                     }

-

                 }

-

-

-                //                catch (System.AccessViolationException)

                 catch (Exception e)

                 {

                     m_log.ErrorFormat("[PHYSICS]: PrimGeom destruction failed for {0} exception {1}", Name, e);

@@ -1552,23 +1552,19 @@ namespace OpenSim.Region.Physics.OdePlugin
                 m_log.ErrorFormat("[PHYSICS]: PrimGeom destruction BAD {0}", Name);

             }

 

-            if (m_mesh != null)

+            lock (m_meshlock)

             {

-                _parent_scene.mesher.ReleaseMesh(m_mesh);

-                m_mesh = null;

+                if (m_mesh != null)

+                {

+                    _parent_scene.mesher.ReleaseMesh(m_mesh);

+                    m_mesh = null;

+                }

             }

 

             Body = IntPtr.Zero;

             hasOOBoffsetFromMesh = false;

         }

-/*

-        private void ChildSetGeom(OdePrim odePrim)

-        {

-            // well.. 

-            DestroyBody();

-            MakeBody();

-        }

-*/

+

         //sets non physical prim m_targetSpace to right space in spaces grid for static prims

         // should only be called for non physical prims unless they are becoming non physical

         private void SetInStaticSpace(OdePrim prim)

@@ -1631,9 +1627,6 @@ namespace OpenSim.Region.Physics.OdePlugin
 

             if (Body != IntPtr.Zero)

             {

-//                d.BodyDestroy(Body);

-//                Body = IntPtr.Zero;

-                // do a more complet destruction

                 DestroyBody();

                 m_log.Warn("[PHYSICS]: MakeBody called having a body");

             }

@@ -2495,6 +2488,26 @@ namespace OpenSim.Region.Physics.OdePlugin
             primOOBradiusSQ = primOOBsize.LengthSquared();

         }

 

+        private void UpdatePrimBodyData()

+        {

+            primMass = m_density * primVolume;

+

+            if (primMass <= 0)

+                primMass = 0.0001f;//ckrinke: Mass must be greater then zero.

+            if (primMass > _parent_scene.maximumMassObject)

+                primMass = _parent_scene.maximumMassObject;

+

+            _mass = primMass; // just in case

+

+            d.MassSetBoxTotal(out primdMass, primMass, primOOBsize.X, primOOBsize.Y, primOOBsize.Z);

+

+            d.MassTranslate(ref primdMass,

+                                primOOBoffset.X,

+                                primOOBoffset.Y,

+                                primOOBoffset.Z);

+

+            primOOBradiusSQ = primOOBsize.LengthSquared();

+        }

 

         #endregion

 

@@ -3227,6 +3240,86 @@ namespace OpenSim.Region.Physics.OdePlugin
             changeprimsizeshape();

         }

 

+

+        private void changePhysRepData(ODEPhysRepData repData)

+        {

+            CheckDelaySelect();

+

+            OdePrim parent = (OdePrim)_parent;

+

+            bool chp = childPrim;

+

+            if (chp)

+            {

+                if (parent != null)

+                {

+                    parent.DestroyBody();

+                }

+            }

+            else

+            {

+                DestroyBody();

+            }

+

+            RemoveGeom();      

+

+            prim_geom = repData.geo;

+            _triMeshData = repData.triMeshData;

+            _size = repData.size;

+            _pbs = repData.pbs;

+            m_mesh = repData.mesh;

+            m_shapetype = repData.shapetype;

+

+            hasOOBoffsetFromMesh = repData.hasOBB;

+            primOOBoffset = repData.OBBOffset;

+            primOOBsize = repData.OBB;

+

+            m_NoColide = repData.NoColide;

+//          m_physCost = repData.physCost;

+//          m_streamCost = repData.streamCost;

+

+            primVolume = repData.volume;

+            m_targetSpace = repData.curSpace;

+

+            UpdatePrimBodyData();

+

+            _parent_scene.actor_name_map[prim_geom] = this;

+

+            if (prim_geom != IntPtr.Zero)

+            {

+                d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);

+                d.Quaternion myrot = new d.Quaternion();

+                myrot.X = _orientation.X;

+                myrot.Y = _orientation.Y;

+                myrot.Z = _orientation.Z;

+                myrot.W = _orientation.W;

+                d.GeomSetQuaternion(prim_geom, ref myrot);

+            }

+

+            if (m_isphysical)

+            {

+                if (chp)

+                {

+                    if (parent != null)

+                    {

+                        parent.MakeBody();

+                    }

+                }

+                else

+                    MakeBody();

+            }

+

+            else

+            {

+                SetInStaticSpace(this);

+                UpdateCollisionCatFlags();

+                ApplyCollisionCatFlags();

+            }

+

+            resetCollisionAccounting();

+        }

+

+

         private void changeFloatOnWater(bool newval)

         {

             m_collidesWater = newval;

@@ -3984,6 +4077,10 @@ namespace OpenSim.Region.Physics.OdePlugin
                     changeShape((PrimitiveBaseShape)arg);

                     break;

 

+                case changes.PhysRepData:

+                    changePhysRepData((ODEPhysRepData) arg);

+                    break;

+

                 case changes.CollidesWater:

                     changeFloatOnWater((bool)arg);

                     break;

@@ -4072,6 +4169,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                     donullchange();

                     break;

 

+

+

                 default:

                     donullchange();

                     break;