aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDahlia Trimble2008-07-07 05:42:37 +0000
committerDahlia Trimble2008-07-07 05:42:37 +0000
commit56c6bdcb2684bf22779aa35386e8e1014ffb95ba (patch)
treebc0ae0ed229ad3376499c56fe32a168b00a939fe
parentfix some Meshmerizer problem angles for sphere dimple and box path cut (diff)
downloadopensim-SC-56c6bdcb2684bf22779aa35386e8e1014ffb95ba.zip
opensim-SC-56c6bdcb2684bf22779aa35386e8e1014ffb95ba.tar.gz
opensim-SC-56c6bdcb2684bf22779aa35386e8e1014ffb95ba.tar.bz2
opensim-SC-56c6bdcb2684bf22779aa35386e8e1014ffb95ba.tar.xz
Addresses more problem box cut angles
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs10
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 95526f6..aabfdaf 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -435,12 +435,6 @@ namespace OpenSim.Region.Physics.Meshing
435 // Int16 twistTop = primShape.PathTwistBegin; 435 // Int16 twistTop = primShape.PathTwistBegin;
436 // Int16 twistBot = primShape.PathTwist; 436 // Int16 twistBot = primShape.PathTwist;
437 437
438 // tweak problem cut angles
439 if (profileBegin > 23 && profileBegin % 50 == 0) profileBegin -= 23;
440 if (profileEnd > 23 && profileEnd % 50 == 0) profileEnd += 23;
441
442
443
444#if SPAM 438#if SPAM
445 reportPrimParams("[BOX] " + primName, primShape); 439 reportPrimParams("[BOX] " + primName, primShape);
446#endif 440#endif
@@ -487,6 +481,10 @@ namespace OpenSim.Region.Physics.Meshing
487 fProfileBeginAngle += 5.0f; 481 fProfileBeginAngle += 5.0f;
488 if ((fProfileEndAngle + 45.0f) % 90.0f == 0.0f) 482 if ((fProfileEndAngle + 45.0f) % 90.0f == 0.0f)
489 fProfileEndAngle -= 5.0f; 483 fProfileEndAngle -= 5.0f;
484 if (fProfileBeginAngle % 90.0f == 0.0f)
485 fProfileBeginAngle += 1.0f;
486 if (fProfileEndAngle % 90.0f == 0.0f)
487 fProfileEndAngle -= 1.0f;
490 488
491 if (fProfileBeginAngle < fProfileEndAngle) 489 if (fProfileBeginAngle < fProfileEndAngle)
492 fProfileEndAngle -= 360.0; 490 fProfileEndAngle -= 360.0;