aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin
diff options
context:
space:
mode:
authorTeravus Ovares2008-02-09 05:18:52 +0000
committerTeravus Ovares2008-02-09 05:18:52 +0000
commitc9b5516ca8664786d85a6c3f48bb831476050c6e (patch)
treed3912f3f2694ee4241e389dbee33fda57bdddada /OpenSim/Region/Physics/OdePlugin
parent* Tweaked timing of rapid mesh requests. Helps a race condition. (diff)
downloadopensim-SC_OLD-c9b5516ca8664786d85a6c3f48bb831476050c6e.zip
opensim-SC_OLD-c9b5516ca8664786d85a6c3f48bb831476050c6e.tar.gz
opensim-SC_OLD-c9b5516ca8664786d85a6c3f48bb831476050c6e.tar.bz2
opensim-SC_OLD-c9b5516ca8664786d85a6c3f48bb831476050c6e.tar.xz
* Adds Top Shear support to the Meshmerizer for the Cube prim and the Cylinder prim.
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs5
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs3
2 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 52a975e..d171947 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -389,7 +389,12 @@ namespace OpenSim.Region.Physics.OdePlugin
389 { 389 {
390 disableBody(); 390 disableBody();
391 } 391 }
392
393 // This sleeper is there to moderate how long it takes between
394 // setting up the mesh and pre-processing it when we get rapid fire mesh requests on a single object
392 System.Threading.Thread.Sleep(10); 395 System.Threading.Thread.Sleep(10);
396
397
393 float[] vertexList = mesh.getVertexListAsFloatLocked(); // Note, that vertextList is pinned in memory 398 float[] vertexList = mesh.getVertexListAsFloatLocked(); // Note, that vertextList is pinned in memory
394 int[] indexList = mesh.getIndexListAsIntLocked(); // Also pinned, needs release after usage 399 int[] indexList = mesh.getIndexListAsIntLocked(); // Also pinned, needs release after usage
395 int VertexCount = vertexList.GetLength(0)/3; 400 int VertexCount = vertexList.GetLength(0)/3;
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 0ee8eb5..2b3d186 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1014,6 +1014,9 @@ namespace OpenSim.Region.Physics.OdePlugin
1014 if ((pbs.PathScaleX != 100) || (pbs.PathScaleY != 100)) 1014 if ((pbs.PathScaleX != 100) || (pbs.PathScaleY != 100))
1015 return true; 1015 return true;
1016 1016
1017 if ((pbs.PathShearX != 0) || (pbs.PathShearY != 0))
1018 return true;
1019
1017 if (pbs.ProfileShape == ProfileShape.Circle && pbs.PathCurve == (byte)Extrusion.Straight) 1020 if (pbs.ProfileShape == ProfileShape.Circle && pbs.PathCurve == (byte)Extrusion.Straight)
1018 return true; 1021 return true;
1019 1022