aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDahlia Trimble2008-07-06 19:44:59 +0000
committerDahlia Trimble2008-07-06 19:44:59 +0000
commit6914fb6f139ceccdfa7722c2983b45887baacdb5 (patch)
treefcf2ff37cb0e8a0fe9fbe44d5b5da788078575fa
parentMantis#1678. Thank you kindly, Vytek for a patch that: (diff)
downloadopensim-SC_OLD-6914fb6f139ceccdfa7722c2983b45887baacdb5.zip
opensim-SC_OLD-6914fb6f139ceccdfa7722c2983b45887baacdb5.tar.gz
opensim-SC_OLD-6914fb6f139ceccdfa7722c2983b45887baacdb5.tar.bz2
opensim-SC_OLD-6914fb6f139ceccdfa7722c2983b45887baacdb5.tar.xz
disables changes in r5356 until I have more time to do further characterization
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index e532415..46e6843 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -1582,14 +1582,14 @@ namespace OpenSim.Region.Physics.Meshing
1582 1582
1583 if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.HalfCircle) 1583 if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.HalfCircle)
1584 { // dimpled sphere uses profile cut but since it's a half circle the angles are smaller 1584 { // dimpled sphere uses profile cut but since it's a half circle the angles are smaller
1585 if (hollowFactor == 0) hollowFactor = 1000; // bare minimum hollow to keep the triangulator happy 1585 //if (hollowFactor == 0) hollowFactor = 1000; // bare minimum hollow to keep the triangulator happy
1586 fProfileBeginAngle = 0.0036f * (float)primShape.ProfileBegin; 1586 fProfileBeginAngle = 0.0036f * (float)primShape.ProfileBegin;
1587 fProfileEndAngle = 180.0f - 0.0036f * (float)primShape.ProfileEnd; 1587 fProfileEndAngle = 180.0f - 0.0036f * (float)primShape.ProfileEnd;
1588 if (fProfileBeginAngle < fProfileEndAngle) 1588 if (fProfileBeginAngle < fProfileEndAngle)
1589 fProfileEndAngle -= 360.0f; 1589 fProfileEndAngle -= 360.0f;
1590 // a cut starting at 0 degrees with a hollow causes an infinite loop so move the start angle 1590 // a cut starting at 0 degrees with a hollow causes an infinite loop so move the start angle
1591 // past it into the empty part of the circle to avoid this condition 1591 // past it into the empty part of the circle to avoid this condition
1592 if (fProfileBeginAngle == 0.0f && hollowFactor != 0) fProfileBeginAngle = -10.0f; 1592 if (fProfileBeginAngle == 0.0f) fProfileBeginAngle = -10.0f;
1593 1593
1594#if SPAM 1594#if SPAM
1595 Console.WriteLine("Sphere dimple: fProfileBeginAngle: " + fProfileBeginAngle.ToString() + " fProfileEndAngle: " + fProfileEndAngle.ToString()); 1595 Console.WriteLine("Sphere dimple: fProfileBeginAngle: " + fProfileBeginAngle.ToString() + " fProfileEndAngle: " + fProfileEndAngle.ToString());