aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs')
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs
index bb661e5..923e2ff 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEMeshWorker.cs
@@ -27,7 +27,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
27 AssetOK = 0x0f, // 00001111 27 AssetOK = 0x0f, // 00001111
28 28
29 NeedMask = 0x30, // 00110000 29 NeedMask = 0x30, // 00110000
30 needMesh = 0x10, // 00010000 30 needMesh = 0x10, // 00010000
31 needAsset = 0x20, // 00100000 31 needAsset = 0x20, // 00100000
32 32
33 FailMask = 0xC0, // 11000000 33 FailMask = 0xC0, // 11000000
@@ -287,7 +287,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
287 public bool needsMeshing(ODEPhysRepData repData) 287 public bool needsMeshing(ODEPhysRepData repData)
288 { 288 {
289 PrimitiveBaseShape pbs = repData.pbs; 289 PrimitiveBaseShape pbs = repData.pbs;
290 // check sculpts or meshs 290 // check sculpts or meshs
291 if (pbs.SculptEntry) 291 if (pbs.SculptEntry)
292 { 292 {
293 if (meshSculptedPrim) 293 if (meshSculptedPrim)
@@ -462,7 +462,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
462 repData.meshState = MeshState.MeshFailed; 462 repData.meshState = MeshState.MeshFailed;
463 return; 463 return;
464 } 464 }
465 } 465 }
466 } 466 }
467 467
468 repData.meshState = MeshState.AssetOK; 468 repData.meshState = MeshState.AssetOK;
@@ -525,7 +525,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
525 } 525 }
526 526
527 mesh = m_mesher.CreateMesh(actor.Name, pbs, size, clod, true, convex, true); 527 mesh = m_mesher.CreateMesh(actor.Name, pbs, size, clod, true, convex, true);
528 528
529 if (mesh == null) 529 if (mesh == null)
530 { 530 {
531 if (pbs.SculptEntry) 531 if (pbs.SculptEntry)
@@ -607,7 +607,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
607 607
608 else if (_pbs.PathCurve == (byte)Extrusion.Curve1) 608 else if (_pbs.PathCurve == (byte)Extrusion.Curve1)
609 { 609 {
610 //a tube 610 //a tube
611 611
612 volume *= 0.78539816339e-2f * (float)(200 - _pbs.PathScaleX); 612 volume *= 0.78539816339e-2f * (float)(200 - _pbs.PathScaleX);
613 tmp = 1.0f - 2.0e-2f * (float)(200 - _pbs.PathScaleY); 613 tmp = 1.0f - 2.0e-2f * (float)(200 - _pbs.PathScaleY);
@@ -857,7 +857,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
857 // this is crude aproximation 857 // this is crude aproximation
858 profileBegin = (float)_pbs.ProfileBegin * 2.0e-5f; 858 profileBegin = (float)_pbs.ProfileBegin * 2.0e-5f;
859 profileEnd = 1.0f - (float)_pbs.ProfileEnd * 2.0e-5f; 859 profileEnd = 1.0f - (float)_pbs.ProfileEnd * 2.0e-5f;
860 volume *= (profileEnd - profileBegin); 860 volume *= (profileEnd - profileBegin);
861 861
862 repData.volume = volume; 862 repData.volume = volume;
863 } 863 }