Merge branch 'master' into httptests

2 files changed, 87 insertions, 20 deletions

diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
index 6e43cf8..d9544db 100644
--- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
@@ -121,9 +121,9 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
 
                 CacheExpire = TimeSpan.FromHours(fcache);
                 
-                if(doMeshFileCache && cachePath != "")
+                lock (diskLock)
                 {
-                    lock (diskLock)
+                    if(doMeshFileCache && cachePath != "")
                     {
                         try
                         {
@@ -619,7 +619,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                                     vs.Clear(); 
                                     continue;
                                 }
-
+/*
                                 if (!HullUtils.ComputeHull(vs, ref hullr, 0, 0.0f))
                                 {
                                     vs.Clear();
@@ -657,6 +657,45 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                                     f = new Face(vertsoffset + t1, vertsoffset + t2, vertsoffset + t3);
                                     faces.Add(f);
                                 }
+*/
+                                List<int> indices;
+                                if (!HullUtils.ComputeHull(vs, out indices))
+                                {
+                                    vs.Clear();
+                                    continue;
+                                }
+
+                                nverts = vs.Count;
+                                nindexs = indices.Count;
+
+                                if (nindexs % 3 != 0)
+                                {
+                                    vs.Clear();
+                                    continue;
+                                }
+
+                                for (i = 0; i < nverts; i++)
+                                {
+                                    c.X = vs[i].x;
+                                    c.Y = vs[i].y;
+                                    c.Z = vs[i].z;
+                                    coords.Add(c);
+                                }
+                               
+                                for (i = 0; i < nindexs; i += 3)
+                                {
+                                    t1 = indices[i];
+                                    if (t1 > nverts)
+                                        break;
+                                    t2 = indices[i + 1];
+                                    if (t2 > nverts)
+                                        break;
+                                    t3 = indices[i + 2];
+                                    if (t3 > nverts)
+                                        break;
+                                    f = new Face(vertsoffset + t1, vertsoffset + t2, vertsoffset + t3);
+                                    faces.Add(f);
+                                }
                                 vertsoffset += nverts;
                                 vs.Clear();
                             }
@@ -686,13 +725,15 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                             vs.Add(f3);
                         }
 
-                        if (vs.Count < 3)
+                        nverts = vs.Count;
+
+                        if (nverts < 3)
                         {
                             vs.Clear();
                             return false;
                         }
 
-                        if (vs.Count < 5)
+                        if (nverts < 5)
                         {
                             foreach (float3 point in vs)
                             {
@@ -701,10 +742,11 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                                 c.Z = point.z;
                                 coords.Add(c);
                             }
+
                             f = new Face(0, 1, 2);
                             faces.Add(f);
 
-                            if (vs.Count == 4)
+                            if (nverts == 4)
                             {
                                 f = new Face(0, 2, 3);
                                 faces.Add(f);
@@ -716,7 +758,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                             vs.Clear();
                             return true;
                         }
-
+/*
                         if (!HullUtils.ComputeHull(vs, ref hullr, 0, 0.0f))
                             return false;
 
@@ -747,7 +789,38 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                             f = new Face(t1, t2, t3);
                             faces.Add(f);
                         }
+*/
+                        List<int> indices;
+                        if (!HullUtils.ComputeHull(vs, out indices))
+                            return false;
+
+                        nindexs = indices.Count;
 
+                        if (nindexs % 3 != 0)
+                            return false;
+
+                        for (i = 0; i < nverts; i++)
+                        {
+                            c.X = vs[i].x;
+                            c.Y = vs[i].y;
+                            c.Z = vs[i].z;
+                            coords.Add(c);
+                        }
+                        for (i = 0; i < nindexs; i += 3)
+                        {
+                            t1 = indices[i];
+                            if (t1 > nverts)
+                                break;
+                            t2 = indices[i + 1];
+                            if (t2 > nverts)
+                                break;
+                            t3 = indices[i + 2];
+                            if (t3 > nverts)
+                                break;
+                            f = new Face(t1, t2, t3);
+                            faces.Add(f);
+                        }
+                        vs.Clear();
                         if (coords.Count > 0 && faces.Count > 0)
                             return true;
                     }
diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/SculptMap.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/SculptMap.cs
index 1c75db6..2ca2af7 100644
--- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/SculptMap.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/SculptMap.cs
@@ -57,7 +57,7 @@ namespace PrimMesher
             int numLodPixels = lod * lod;  // (32 * 2)^2  = 64^2 pixels for default sculpt map image
 
             bool needsScaling = false;
-            bool smallMap = false;
+            bool smallMap = false;          
 
             width = bmW;
             height = bmH;
@@ -69,16 +69,8 @@ namespace PrimMesher
                 needsScaling = true;
             }
 
-            try
-            {
-                if (needsScaling)
-                    bm = ScaleImage(bm, width, height);
-            }
-
-            catch (Exception e)
-            {
-                throw new Exception("Exception in ScaleImage(): e: " + e.ToString());
-            }
+            if (needsScaling)
+                bm = ScaleImage(bm, width, height);
 
             if (width * height > numLodPixels)
             {
@@ -129,11 +121,15 @@ namespace PrimMesher
             }
             catch (Exception e)
             {
+                if (needsScaling)
+                    bm.Dispose();
                 throw new Exception("Caught exception processing byte arrays in SculptMap(): e: " + e.ToString());
             }
 
             width++;
             height++;
+            if(needsScaling)
+                bm.Dispose();
         }
 
         public List<List<Coord>> ToRows(bool mirror)
@@ -168,11 +164,9 @@ namespace PrimMesher
 
         private Bitmap ScaleImage(Bitmap srcImage, int destWidth, int destHeight)
         {
-
             Bitmap scaledImage = new Bitmap(destWidth, destHeight, PixelFormat.Format24bppRgb);
 
             Color c;
-            
 
             // will let last step to be eventually diferent, as seems to be in sl