Merge branch 'avination'

3 files changed, 106 insertions, 69 deletions

diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
index 1084b0e..093bc3c 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
@@ -522,29 +522,6 @@ namespace OpenSim.Region.Physics.OdePlugin
             }
         }
 
-        //UBit mess
-        /* for later use
-                public override Vector3 PrimOOBsize
-                    {
-                    get
-                        {
-                        Vector3 s=Size;
-                        s.X *=0.5f;
-                        s.Y *=0.5f;
-                        s.Z *=0.5f;
-                        return s;
-                        }
-                    }
- 
-                public override Vector3 PrimOOBoffset
-                    {
-                    get
-                        {
-                        return Vector3.Zero;
-                        }
-                    }
-        */
-
         public override PrimitiveBaseShape Shape
         {
             set { return; }
@@ -1345,8 +1322,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             m_iscollidingGround = false;
             m_iscollidingObj = false;
 
-            CollisionEventsThisFrame = new CollisionEventUpdate();
-            m_eventsubscription = 0;
+            CollisionEventsThisFrame.Clear();
         }
 
         private void changeForce(Vector3 newForce)
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
index 62fd279..5109a6a 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
@@ -504,8 +504,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                 }

             }

         }

-/*

-        public override Vector3 PrimOOBsize

+

+        public override Vector3 OOBsize

             {

             get

                 {

@@ -513,7 +513,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 }

             }

 

-        public override Vector3 PrimOOBoffset

+        public override Vector3 OOBoffset

             {

             get

                 {

@@ -521,14 +521,14 @@ namespace OpenSim.Region.Physics.OdePlugin
                 }

             }

 

-        public override float PrimOOBRadiusSQ

+        public override float OOBRadiusSQ

             {

             get

                 {

                 return primOOBradiusSQ;

                 }

             }

-*/

+

         public override PrimitiveBaseShape Shape

         {

             set

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

                 d.Quaternion qtmp;

                 d.GeomCopyQuaternion(prim_geom, out qtmp);

-                _orientation.W = qtmp.W;

                 _orientation.X = qtmp.X;

                 _orientation.Y = qtmp.Y;

                 _orientation.Z = qtmp.Z;

+                _orientation.W = qtmp.W;

 

                 d.Vector3 lpos = d.GeomGetPosition(prim_geom);

                 _position.X = lpos.X;

diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index bfcfd21..286c7f0 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -1006,16 +1006,82 @@ namespace OpenSim.Region.Physics.OdePlugin
                 else
 
                 {
-                    if (dop1foot && (p1.Position.Z - curContact.pos.Z) > (p1.Size.Z - avCapRadius) * 0.5f)
-                        p1.IsColliding = true;
-                    if (dop2foot && (p2.Position.Z - curContact.pos.Z) > (p2.Size.Z - avCapRadius) * 0.5f)
-                        p2.IsColliding = true;
 
-                    if (AvanormOverride && curContact.depth > 0.3f)
+                    if (AvanormOverride)
                     {
-                        curContact.normal.X = normoverride.X;
-                        curContact.normal.Y = normoverride.Y;
-                        curContact.normal.Z = normoverride.Z;
+                        if (curContact.depth > 0.3f)
+                        {
+                            if (dop1foot && (p1.Position.Z - curContact.pos.Z) > (p1.Size.Z - avCapRadius) * 0.5f)
+                                p1.IsColliding = true;
+                            if (dop2foot && (p2.Position.Z - curContact.pos.Z) > (p2.Size.Z - avCapRadius) * 0.5f)
+                                p2.IsColliding = true;
+                            curContact.normal.X = normoverride.X;
+                            curContact.normal.Y = normoverride.Y;
+                            curContact.normal.Z = normoverride.Z;
+                        }
+
+                        else
+                        {
+                            if (dop1foot)
+                            {
+                                float sz = p1.Size.Z;
+                                Vector3 vtmp = p1.Position;
+                                float ppos = curContact.pos.Z - vtmp.Z + (sz - avCapRadius) * 0.5f;
+                                if (ppos > 0f)
+                                {
+                                    if (!p1.Flying)
+                                    {
+                                        d.AABB aabb;
+                                        d.GeomGetAABB(g2, out aabb);
+                                        float tmp = vtmp.Z - sz * .25f;
+
+                                        if (aabb.MaxZ < tmp)
+                                        {
+                                            vtmp.X = curContact.pos.X - vtmp.X;
+                                            vtmp.Y = curContact.pos.Y - vtmp.Y;
+                                            vtmp.Z = -0.2f;
+                                            vtmp.Normalize();
+                                            curContact.normal.X = vtmp.X;
+                                            curContact.normal.Y = vtmp.Y;
+                                            curContact.normal.Z = vtmp.Z;
+                                        }
+                                    }
+                                }
+                                else
+                                    p1.IsColliding = true;
+
+                            }
+
+                            if (dop2foot)
+                            {
+                                float sz = p2.Size.Z;
+                                Vector3 vtmp = p2.Position;
+                                float ppos = curContact.pos.Z - vtmp.Z + (sz - avCapRadius) * 0.5f;
+                                if (ppos > 0f)
+                                {
+                                    if (!p2.Flying)
+                                    {
+                                        d.AABB aabb;
+                                        d.GeomGetAABB(g1, out aabb);
+                                        float tmp = vtmp.Z - sz * .25f;
+
+                                        if (aabb.MaxZ < tmp)
+                                        {
+                                            vtmp.X = curContact.pos.X - vtmp.X;
+                                            vtmp.Y = curContact.pos.Y - vtmp.Y;
+                                            vtmp.Z = -0.2f;
+                                            vtmp.Normalize();
+                                            curContact.normal.X = vtmp.X;
+                                            curContact.normal.Y = vtmp.Y;
+                                            curContact.normal.Z = vtmp.Z;
+                                        }
+                                    }
+                                }
+                                else
+                                    p2.IsColliding = true;
+
+                            }
+                        }
                     }
 
                     Joint = CreateContacJoint(ref curContact, mu, bounce, cfm, erpscale, dscale);
@@ -1609,41 +1675,40 @@ namespace OpenSim.Region.Physics.OdePlugin
         /// <returns></returns>
         public bool needsMeshing(PrimitiveBaseShape pbs)
         {
-            // most of this is redundant now as the mesher will return null if it cant mesh a prim
-            // but we still need to check for sculptie meshing being enabled so this is the most
-            // convenient place to do it for now...
-
-        //    //if (pbs.PathCurve == (byte)Primitive.PathCurve.Circle && pbs.ProfileCurve == (byte)Primitive.ProfileCurve.Circle && pbs.PathScaleY <= 0.75f)
-        //    //m_log.Debug("needsMeshing: " + " pathCurve: " + pbs.PathCurve.ToString() + " profileCurve: " + pbs.ProfileCurve.ToString() + " pathScaleY: " + Primitive.UnpackPathScale(pbs.PathScaleY).ToString());
-            int iPropertiesNotSupportedDefault = 0;
-
+            // check sculpts or meshs 
             if (pbs.SculptEntry)
             {
-                if(!meshSculptedPrim)
-                    return false;
+                if (meshSculptedPrim)
+                    return true;
+
+                if (pbs.SculptType == (byte)SculptType.Mesh) // always do meshs
+                    return true;
+
+                return false;
             }
 
+            if (forceSimplePrimMeshing)
+                return true;
+
             // if it's a standard box or sphere with no cuts, hollows, twist or top shear, return false since ODE can use an internal representation for the prim
-            if (!forceSimplePrimMeshing && !pbs.SculptEntry)
-            {
-                if ((pbs.ProfileShape == ProfileShape.Square && pbs.PathCurve == (byte)Extrusion.Straight)
+
+            if ((pbs.ProfileShape == ProfileShape.Square && pbs.PathCurve == (byte)Extrusion.Straight)
                     || (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte)Extrusion.Curve1
                     && pbs.Scale.X == pbs.Scale.Y && pbs.Scale.Y == pbs.Scale.Z))
-                {
+            {
 
-                    if (pbs.ProfileBegin == 0 && pbs.ProfileEnd == 0
-                        && pbs.ProfileHollow == 0
-                        && pbs.PathTwist == 0 && pbs.PathTwistBegin == 0
-                        && pbs.PathBegin == 0 && pbs.PathEnd == 0
-                        && pbs.PathTaperX == 0 && pbs.PathTaperY == 0
-                        && pbs.PathScaleX == 100 && pbs.PathScaleY == 100
-                        && pbs.PathShearX == 0 && pbs.PathShearY == 0)
-                    {
+                if (pbs.ProfileBegin == 0 && pbs.ProfileEnd == 0
+                    && pbs.ProfileHollow == 0
+                    && pbs.PathTwist == 0 && pbs.PathTwistBegin == 0
+                    && pbs.PathBegin == 0 && pbs.PathEnd == 0
+                    && pbs.PathTaperX == 0 && pbs.PathTaperY == 0
+                    && pbs.PathScaleX == 100 && pbs.PathScaleY == 100
+                    && pbs.PathShearX == 0 && pbs.PathShearY == 0)
+                {
 #if SPAM
-                    m_log.Warn("NonMesh");
+                m_log.Warn("NonMesh");
 #endif
-                        return false;
-                    }
+                    return false;
                 }
             }
 
@@ -1651,8 +1716,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             // and it's odd..  so for now just return true if asked to force meshs
             // hopefully mesher will fail if doesn't suport so things still get basic boxes
 
-            if (forceSimplePrimMeshing)
-                return true;
+            int iPropertiesNotSupportedDefault = 0;
 
             if (pbs.ProfileHollow != 0)
                 iPropertiesNotSupportedDefault++;
@@ -1721,9 +1785,6 @@ namespace OpenSim.Region.Physics.OdePlugin
                 }
             }
 
-            if (pbs.SculptEntry && meshSculptedPrim)
-                iPropertiesNotSupportedDefault++;
-
             if (iPropertiesNotSupportedDefault == 0)
             {
 #if SPAM