aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager/ZeroMesher.cs
diff options
context:
space:
mode:
authorRobert Adams2012-11-29 09:24:53 -0800
committerRobert Adams2012-11-29 09:24:53 -0800
commit0cd99c74a70ddfd42c3e8325716f56bf35d4474c (patch)
tree7d2c78ce242c51f49c375e53e83788a1e45abbeb /OpenSim/Region/Physics/Manager/ZeroMesher.cs
parentBulletSim: reverse direction of hover correction. Removes problem with vehicl... (diff)
downloadopensim-SC_OLD-0cd99c74a70ddfd42c3e8325716f56bf35d4474c.zip
opensim-SC_OLD-0cd99c74a70ddfd42c3e8325716f56bf35d4474c.tar.gz
opensim-SC_OLD-0cd99c74a70ddfd42c3e8325716f56bf35d4474c.tar.bz2
opensim-SC_OLD-0cd99c74a70ddfd42c3e8325716f56bf35d4474c.tar.xz
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.
Diffstat (limited to 'OpenSim/Region/Physics/Manager/ZeroMesher.cs')
-rw-r--r--OpenSim/Region/Physics/Manager/ZeroMesher.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/ZeroMesher.cs b/OpenSim/Region/Physics/Manager/ZeroMesher.cs
index ba19db6..270d2ec 100644
--- a/OpenSim/Region/Physics/Manager/ZeroMesher.cs
+++ b/OpenSim/Region/Physics/Manager/ZeroMesher.cs
@@ -64,11 +64,16 @@ namespace OpenSim.Region.Physics.Manager
64 { 64 {
65 public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod) 65 public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod)
66 { 66 {
67 return CreateMesh(primName, primShape, size, lod, false); 67 return CreateMesh(primName, primShape, size, lod, false, false);
68 } 68 }
69 69
70 public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical) 70 public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical)
71 { 71 {
72 return CreateMesh(primName, primShape, size, lod, false, false);
73 }
74
75 public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool shouldCache)
76 {
72 // Remove the reference to the encoded JPEG2000 data so it can be GCed 77 // Remove the reference to the encoded JPEG2000 data so it can be GCed
73 primShape.SculptData = OpenMetaverse.Utils.EmptyBytes; 78 primShape.SculptData = OpenMetaverse.Utils.EmptyBytes;
74 79