Merge branch 'master' into bulletsim

1 files changed, 74 insertions, 41 deletions

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 99b2d84..5ca5f20 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -100,7 +100,6 @@ namespace OpenSim.Region.Physics.Meshing
             {
                 m_log.WarnFormat("[SCULPT]: Unable to create {0} directory: ", decodedSculptMapPath, e.Message);
             }
-
         }
 
         /// <summary>
@@ -156,7 +155,6 @@ namespace OpenSim.Region.Physics.Meshing
             return box;
         }
 
-
         /// <summary>
         /// Creates a simple bounding box mesh for a complex input mesh
         /// </summary>
@@ -193,7 +191,6 @@ namespace OpenSim.Region.Physics.Meshing
             m_log.Error(message);
             m_log.Error("\nPrim Name: " + primName);
             m_log.Error("****** PrimMesh Parameters ******\n" + primMesh.ParamsToDisplayString());
-
         }
 
         private ulong GetMeshKey(PrimitiveBaseShape pbs, Vector3 size, float lod)
@@ -257,6 +254,52 @@ namespace OpenSim.Region.Physics.Meshing
             return ((hash << 5) + hash) + (ulong)(c >> 8);
         }
 
+        /// <summary>
+        /// Add a submesh to an existing list of coords and faces.
+        /// </summary>
+        /// <param name="subMeshData"></param>
+        /// <param name="size">Size of entire object</param>
+        /// <param name="coords"></param>
+        /// <param name="faces"></param>
+        private void AddSubMesh(OSDMap subMeshData, Vector3 size, List<Coord> coords, List<Face> faces)
+        {
+    //                                    Console.WriteLine("subMeshMap for {0} - {1}", primName, Util.GetFormattedXml((OSD)subMeshMap));
+    
+            // As per http://wiki.secondlife.com/wiki/Mesh/Mesh_Asset_Format, some Mesh Level
+            // of Detail Blocks (maps) contain just a NoGeometry key to signal there is no
+            // geometry for this submesh.
+            if (subMeshData.ContainsKey("NoGeometry") && ((OSDBoolean)subMeshData["NoGeometry"]))
+                return;
+    
+            OpenMetaverse.Vector3 posMax = ((OSDMap)subMeshData["PositionDomain"])["Max"].AsVector3();
+            OpenMetaverse.Vector3 posMin = ((OSDMap)subMeshData["PositionDomain"])["Min"].AsVector3();
+            ushort faceIndexOffset = (ushort)coords.Count;
+
+            byte[] posBytes = subMeshData["Position"].AsBinary();
+            for (int i = 0; i < posBytes.Length; i += 6)
+            {
+                ushort uX = Utils.BytesToUInt16(posBytes, i);
+                ushort uY = Utils.BytesToUInt16(posBytes, i + 2);
+                ushort uZ = Utils.BytesToUInt16(posBytes, i + 4);
+    
+                Coord c = new Coord(
+                Utils.UInt16ToFloat(uX, posMin.X, posMax.X) * size.X,
+                Utils.UInt16ToFloat(uY, posMin.Y, posMax.Y) * size.Y,
+                Utils.UInt16ToFloat(uZ, posMin.Z, posMax.Z) * size.Z);
+    
+                coords.Add(c);
+            }
+    
+            byte[] triangleBytes = subMeshData["TriangleList"].AsBinary();
+            for (int i = 0; i < triangleBytes.Length; i += 6)
+            {
+                ushort v1 = (ushort)(Utils.BytesToUInt16(triangleBytes, i) + faceIndexOffset);
+                ushort v2 = (ushort)(Utils.BytesToUInt16(triangleBytes, i + 2) + faceIndexOffset);
+                ushort v3 = (ushort)(Utils.BytesToUInt16(triangleBytes, i + 4) + faceIndexOffset);
+                Face f = new Face(v1, v2, v3);
+                faces.Add(f);
+            }
+        }
 
         private Mesh CreateMeshFromPrimMesher(string primName, PrimitiveBaseShape primShape, Vector3 size, float lod)
         {
@@ -276,7 +319,7 @@ namespace OpenSim.Region.Physics.Meshing
                     if (!useMeshiesPhysicsMesh)
                         return null;
 
-                    m_log.Debug("[MESH]: experimental mesh proxy generation");
+                    m_log.DebugFormat("[MESH]: experimental mesh proxy generation for {0}", primName);
 
                     OSD meshOsd = null;
 
@@ -291,23 +334,38 @@ namespace OpenSim.Region.Physics.Meshing
                     {
                         try
                         {
-                            meshOsd = (OSDMap)OSDParser.DeserializeLLSDBinary(data);
+                            OSD osd = OSDParser.DeserializeLLSDBinary(data);
+                            if (osd is OSDMap)
+                                meshOsd = (OSDMap)osd;
+                            else
+                            {
+                                m_log.Warn("[Mesh}: unable to cast mesh asset to OSDMap");
+                                return null;
+                            }
                         }
                         catch (Exception e)
                         {
                             m_log.Error("[MESH]: Exception deserializing mesh asset header:" + e.ToString());
                         }
+
                         start = data.Position;
                     }
 
                     if (meshOsd is OSDMap)
                     {
+                        OSDMap physicsParms = null;
                         OSDMap map = (OSDMap)meshOsd;
-                        OSDMap physicsParms = (OSDMap)map["physics_shape"]; // old asset format
-
-                        if (physicsParms.Count == 0)
+                        if (map.ContainsKey("physics_shape"))
+                            physicsParms = (OSDMap)map["physics_shape"]; // old asset format
+                        else if (map.ContainsKey("physics_mesh"))
                             physicsParms = (OSDMap)map["physics_mesh"]; // new asset format
 
+                        if (physicsParms == null)
+                        {
+                            m_log.Warn("[MESH]: no recognized physics mesh found in mesh asset");
+                            return null;
+                        }
+
                         int physOffset = physicsParms["offset"].AsInteger() + (int)start;
                         int physSize = physicsParms["size"].AsInteger();
 
@@ -353,42 +411,13 @@ namespace OpenSim.Region.Physics.Meshing
                         // physics_shape is an array of OSDMaps, one for each submesh
                         if (decodedMeshOsd is OSDArray)
                         {
+//                            Console.WriteLine("decodedMeshOsd for {0} - {1}", primName, Util.GetFormattedXml(decodedMeshOsd));
+
                             decodedMeshOsdArray = (OSDArray)decodedMeshOsd;
                             foreach (OSD subMeshOsd in decodedMeshOsdArray)
                             {
                                 if (subMeshOsd is OSDMap)
-                                {
-                                    OSDMap subMeshMap = (OSDMap)subMeshOsd;
-
-                                    OpenMetaverse.Vector3 posMax = ((OSDMap)subMeshMap["PositionDomain"])["Max"].AsVector3();
-                                    OpenMetaverse.Vector3 posMin = ((OSDMap)subMeshMap["PositionDomain"])["Min"].AsVector3();
-                                    ushort faceIndexOffset = (ushort)coords.Count;
-
-                                    byte[] posBytes = subMeshMap["Position"].AsBinary();
-                                    for (int i = 0; i < posBytes.Length; i += 6)
-                                    {
-                                        ushort uX = Utils.BytesToUInt16(posBytes, i);
-                                        ushort uY = Utils.BytesToUInt16(posBytes, i + 2);
-                                        ushort uZ = Utils.BytesToUInt16(posBytes, i + 4);
-
-                                        Coord c = new Coord(
-                                        Utils.UInt16ToFloat(uX, posMin.X, posMax.X) * size.X,
-                                        Utils.UInt16ToFloat(uY, posMin.Y, posMax.Y) * size.Y,
-                                        Utils.UInt16ToFloat(uZ, posMin.Z, posMax.Z) * size.Z);
-
-                                        coords.Add(c);
-                                    }
-
-                                    byte[] triangleBytes = subMeshMap["TriangleList"].AsBinary();
-                                    for (int i = 0; i < triangleBytes.Length; i += 6)
-                                    {
-                                        ushort v1 = (ushort)(Utils.BytesToUInt16(triangleBytes, i) + faceIndexOffset);
-                                        ushort v2 = (ushort)(Utils.BytesToUInt16(triangleBytes, i + 2) + faceIndexOffset);
-                                        ushort v3 = (ushort)(Utils.BytesToUInt16(triangleBytes, i + 4) + faceIndexOffset);
-                                        Face f = new Face(v1, v2, v3);
-                                        faces.Add(f);
-                                    }
-                                }
+                                    AddSubMesh(subMeshOsd as OSDMap, size, coords, faces);
                             }
                         }
                     }
@@ -511,7 +540,6 @@ namespace OpenSim.Region.Physics.Meshing
 
                     profileBegin = 0.5f * profileBegin + 0.5f;
                     profileEnd = 0.5f * profileEnd + 0.5f;
-
                 }
 
                 int hollowSides = sides;
@@ -620,6 +648,7 @@ namespace OpenSim.Region.Physics.Meshing
                 Face f = faces[i];
                 mesh.Add(new Triangle(vertices[f.v1], vertices[f.v2], vertices[f.v3]));
             }
+
             return mesh;
         }
 
@@ -630,6 +659,10 @@ namespace OpenSim.Region.Physics.Meshing
 
         public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical)
         {
+#if SPAM
+            m_log.DebugFormat("[MESH]: Creating mesh for {0}", primName);
+#endif
+
             Mesh mesh = null;
             ulong key = 0;