aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin
diff options
context:
space:
mode:
authorDahlia Trimble2008-07-12 01:58:20 +0000
committerDahlia Trimble2008-07-12 01:58:20 +0000
commit13399ff4393b0fbf6e2caf79542f62e9b4ba4281 (patch)
tree546a8a6d08c1d9acdff47e06a1f9c9be364df3f7 /OpenSim/Region/Physics/OdePlugin
parentPatch #9142 (No mantis) (diff)
downloadopensim-SC-13399ff4393b0fbf6e2caf79542f62e9b4ba4281.zip
opensim-SC-13399ff4393b0fbf6e2caf79542f62e9b4ba4281.tar.gz
opensim-SC-13399ff4393b0fbf6e2caf79542f62e9b4ba4281.tar.bz2
opensim-SC-13399ff4393b0fbf6e2caf79542f62e9b4ba4281.tar.xz
Passes prim physical status to mesher from physics plugins
Small prims now get a full mesh if they are physical Fixed a logic bug that was preventing many prim meshes from having excess memory cleaned up Switched to more conservative method of vertex and triangle list trimming to prevent possible crash
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs4
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs2
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index d063507..f7fbaf1 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -922,7 +922,7 @@ namespace OpenSim.Region.Physics.OdePlugin
922 if (_parent_scene.needsMeshing(_pbs)) 922 if (_parent_scene.needsMeshing(_pbs))
923 { 923 {
924 // Don't need to re-enable body.. it's done in SetMesh 924 // Don't need to re-enable body.. it's done in SetMesh
925 _mesh = _parent_scene.mesher.CreateMesh(m_primName, _pbs, _size, _parent_scene.meshSculptLOD); 925 _mesh = _parent_scene.mesher.CreateMesh(m_primName, _pbs, _size, _parent_scene.meshSculptLOD, IsPhysical);
926 // createmesh returns null when it's a shape that isn't a cube. 926 // createmesh returns null when it's a shape that isn't a cube.
927 } 927 }
928 } 928 }
@@ -1496,7 +1496,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1496 if (IsPhysical) 1496 if (IsPhysical)
1497 meshlod = _parent_scene.MeshSculptphysicalLOD; 1497 meshlod = _parent_scene.MeshSculptphysicalLOD;
1498 1498
1499 IMesh mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod); 1499 IMesh mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical);
1500 // createmesh returns null when it's a shape that isn't a cube. 1500 // createmesh returns null when it's a shape that isn't a cube.
1501 if (mesh != null) 1501 if (mesh != null)
1502 { 1502 {
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 3dd80ea..cd5032c 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1177,7 +1177,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1177 /// support simple box & hollow box now; later, more shapes 1177 /// support simple box & hollow box now; later, more shapes
1178 if (needsMeshing(pbs)) 1178 if (needsMeshing(pbs))
1179 { 1179 {
1180 mesh = mesher.CreateMesh(primName, pbs, size, 32f); 1180 mesh = mesher.CreateMesh(primName, pbs, size, 32f, isPhysical);
1181 } 1181 }
1182 1182
1183 break; 1183 break;