OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix some Meshmerizer problem angles for sphere dimple and box path cut

0.6.0-stable
Dahlia Trimble 2008-07-07 04:32:05 +00:00
parent 6914fb6f13
commit 063365c0dc
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
View File

@ -435,6 +435,12 @@ namespace OpenSim.Region.Physics.Meshing
// Int16 twistTop = primShape.PathTwistBegin; // Int16 twistTop = primShape.PathTwistBegin;
// Int16 twistBot = primShape.PathTwist; // Int16 twistBot = primShape.PathTwist;
// tweak problem cut angles
if (profileBegin > 23 && profileBegin % 50 == 0) profileBegin -= 23;
if (profileEnd > 23 && profileEnd % 50 == 0) profileEnd += 23;
#if SPAM #if SPAM
reportPrimParams("[BOX] " + primName, primShape); reportPrimParams("[BOX] " + primName, primShape);
#endif #endif
@ -1539,7 +1545,7 @@ namespace OpenSim.Region.Physics.Meshing
&& primShape.PathTwistBegin == 0 && primShape.PathTwistBegin == 0
&& primShape.ProfileBegin == 0 && primShape.ProfileBegin == 0
&& primShape.ProfileEnd == 0 && primShape.ProfileEnd == 0
&& primShape.ProfileHollow == 0 && hollowFactor == 0
) // simple sphere, revert to geodesic shape ) // simple sphere, revert to geodesic shape
) )
@ -1550,6 +1556,12 @@ namespace OpenSim.Region.Physics.Meshing
return CreateSphereMesh(primName, primShape, size); return CreateSphereMesh(primName, primShape, size);
} }
if (hollowFactor == 0)
{
// the hull triangulator is happier with a minimal hollow
hollowFactor = 2000;
}
if (hollowShape == HollowShape.Same) if (hollowShape == HollowShape.Same)
hollowShape = HollowShape.Circle; hollowShape = HollowShape.Circle;
@ -1582,7 +1594,6 @@ namespace OpenSim.Region.Physics.Meshing
if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.HalfCircle) if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.HalfCircle)
{ // dimpled sphere uses profile cut but since it's a half circle the angles are smaller { // dimpled sphere uses profile cut but since it's a half circle the angles are smaller
//if (hollowFactor == 0) hollowFactor = 1000; // bare minimum hollow to keep the triangulator happy
fProfileBeginAngle = 0.0036f * (float)primShape.ProfileBegin; fProfileBeginAngle = 0.0036f * (float)primShape.ProfileBegin;
fProfileEndAngle = 180.0f - 0.0036f * (float)primShape.ProfileEnd; fProfileEndAngle = 180.0f - 0.0036f * (float)primShape.ProfileEnd;
if (fProfileBeginAngle < fProfileEndAngle) if (fProfileBeginAngle < fProfileEndAngle)
@ -2084,8 +2095,8 @@ namespace OpenSim.Region.Physics.Meshing
+ "Name.............: " + name.ToString() + "\n" + "Name.............: " + name.ToString() + "\n"
+ "HollowShape......: " + primShape.HollowShape.ToString() + "\n" + "HollowShape......: " + primShape.HollowShape.ToString() + "\n"
+ "PathBegin........: " + primShape.PathBegin.ToString() + " " + pathBegin.ToString() + "\n" + "PathBegin........: " + primShape.PathBegin.ToString() + " " + pathBegin.ToString() + "\n"
+ "PathCurve........: " + primShape.PathCurve.ToString() + " " + pathEnd.ToString() + "\n" + "PathCurve........: " + primShape.PathCurve.ToString() + "\n"
+ "PathEnd..........: " + primShape.PathEnd.ToString() + "\n" + "PathEnd..........: " + primShape.PathEnd.ToString() + " " + pathEnd.ToString() + "\n"
+ "PathRadiusOffset.: " + primShape.PathRadiusOffset.ToString() + "\n" + "PathRadiusOffset.: " + primShape.PathRadiusOffset.ToString() + "\n"
+ "PathRevolutions..: " + primShape.PathRevolutions.ToString() + "\n" + "PathRevolutions..: " + primShape.PathRevolutions.ToString() + "\n"
+ "PathScaleX.......: " + primShape.PathScaleX.ToString() + "\n" + "PathScaleX.......: " + primShape.PathScaleX.ToString() + "\n"