From 0cd99c74a70ddfd42c3e8325716f56bf35d4474c Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 29 Nov 2012 09:24:53 -0800
Subject: BulletSim: add expanded call to IMesher/Meshmerizer which
 enables/disables mesh caching. Since BulletSim caches and tracks the
 unmanaged memory version of meshes, the Meshmerizer itself does not need to
 cache built meshes once BulletSim has made the physical proxy mesh.

---
 OpenSim/Region/Physics/Manager/IMesher.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenSim/Region/Physics/Manager/IMesher.cs')

diff --git a/OpenSim/Region/Physics/Manager/IMesher.cs b/OpenSim/Region/Physics/Manager/IMesher.cs
index 3a9ca1b..10c4bd3 100644
--- a/OpenSim/Region/Physics/Manager/IMesher.cs
+++ b/OpenSim/Region/Physics/Manager/IMesher.cs
@@ -36,6 +36,7 @@ namespace OpenSim.Region.Physics.Manager
     {
         IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod);
         IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical);
+        IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool shouldCache);
     }
 
     // Values for level of detail to be passed to the mesher.
-- 
cgit v1.1


From dce9e323f4f0fdccd2f34266e870de9cbcebd2f0 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 5 Feb 2013 16:51:02 -0800
Subject: BulletSim: remove degenerate triangles from meshes. This fixes the
 invisible barriers in sculptie doorways (Mantis 6529). Bump up
 level-of-detail for physical meshes to 32 (the max). This fixes the invisible
 barriers that showed up in prim cut arches. NOTE: the default LOD values are
 removed from OpenSimDefaults.ini.    If you don't change your
 OpenSimDefaults.ini, you will continue    to see the arch problem.

---
 OpenSim/Region/Physics/Manager/IMesher.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenSim/Region/Physics/Manager/IMesher.cs')

diff --git a/OpenSim/Region/Physics/Manager/IMesher.cs b/OpenSim/Region/Physics/Manager/IMesher.cs
index 10c4bd3..2e7bb5d 100644
--- a/OpenSim/Region/Physics/Manager/IMesher.cs
+++ b/OpenSim/Region/Physics/Manager/IMesher.cs
@@ -59,6 +59,7 @@ namespace OpenSim.Region.Physics.Manager
         List<Vector3> getVertexList();
         int[] getIndexListAsInt();
         int[] getIndexListAsIntLocked();
+        float[] getVertexListAsFloat();
         float[] getVertexListAsFloatLocked();
         void getIndexListAsPtrToIntArray(out IntPtr indices, out int triStride, out int indexCount);
         void getVertexListAsPtrToFloatArray(out IntPtr vertexList, out int vertexStride, out int vertexCount);
-- 
cgit v1.1