From 832d609b44c2461752b0a130bddeb2e21579f6ad Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Mon, 2 Jun 2008 08:31:34 +0000
Subject: PATCH : 0001431: corrections to torus physical mesh for default
 hollow shape and taper orientation along path. --------- From Dahlia!  Thanks
 Dahlia!!! the attached patch reinstates the default hollow shape of the
 physics mesh of the torus prim type and corrects the orientation of the
 effects of taper on the profile along the path.

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Physics/Meshing/Meshmerizer.cs')

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index a716d93..0c62447 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -1541,7 +1541,7 @@ namespace OpenSim.Region.Physics.Meshing
                 }
                 else
                 {
-                    holeHull = BuildHoleHull(primShape, primShape.ProfileShape, primShape.HollowShape, hollowFactor);
+                    holeHull = BuildHoleHull(primShape, primShape.ProfileShape, hollowShape, hollowFactor);
                 }
 
                 if (holeHull != null)
@@ -1900,6 +1900,8 @@ namespace OpenSim.Region.Physics.Meshing
         private static void reportPrimParams(string name, PrimitiveBaseShape primShape)
         {
 #if SPAM
+            float pathShearX = primShape.PathShearX < 128 ? (float)primShape.PathShearX * 0.01f : (float)(primShape.PathShearX - 256) * 0.01f;
+            float pathShearY = primShape.PathShearY < 128 ? (float)primShape.PathShearY * 0.01f : (float)(primShape.PathShearY - 256) * 0.01f;
 
             Console.WriteLine("********************* PrimitiveBaseShape Parameters *******************\n"
                 + "Name.............: " + name.ToString() + "\n"
@@ -1911,8 +1913,8 @@ namespace OpenSim.Region.Physics.Meshing
                 + "PathRevolutions..: " + primShape.PathRevolutions.ToString() + "\n"
                 + "PathScaleX.......: " + primShape.PathScaleX.ToString() + "\n"
                 + "PathScaleY.......: " + primShape.PathScaleY.ToString() + "\n"
-                + "PathShearX.......: " + primShape.PathShearX.ToString() + "\n"
-                + "PathShearY.......: " + primShape.PathShearY.ToString() + "\n"
+                + "PathShearX.......: " + primShape.PathShearX.ToString() + " (" + pathShearX.ToString() + ")\n"
+                + "PathShearY.......: " + primShape.PathShearY.ToString() + " (" + pathShearY.ToString() + ")\n"
                 + "PathSkew.........: " + primShape.PathSkew.ToString() + "\n"
                 + "PathTaperX.......: " + primShape.PathTaperX.ToString() + "\n"
                 + "PathTaperY.......: " + primShape.PathTaperY.ToString() + "\n"
-- 
cgit v1.1