aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-06-02 08:31:34 +0000
committerTeravus Ovares2008-06-02 08:31:34 +0000
commit832d609b44c2461752b0a130bddeb2e21579f6ad (patch)
treeac67751a2b2a38924255afe595835ec5c3a972f1 /OpenSim/Region/Physics/Meshing/Meshmerizer.cs
parent* While I couldn't reproduce it, I was able to see how it *might* happen, so ... (diff)
downloadopensim-SC_OLD-832d609b44c2461752b0a130bddeb2e21579f6ad.zip
opensim-SC_OLD-832d609b44c2461752b0a130bddeb2e21579f6ad.tar.gz
opensim-SC_OLD-832d609b44c2461752b0a130bddeb2e21579f6ad.tar.bz2
opensim-SC_OLD-832d609b44c2461752b0a130bddeb2e21579f6ad.tar.xz
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.
Diffstat (limited to 'OpenSim/Region/Physics/Meshing/Meshmerizer.cs')
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs8
1 files changed, 5 insertions, 3 deletions
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
1541 } 1541 }
1542 else 1542 else
1543 { 1543 {
1544 holeHull = BuildHoleHull(primShape, primShape.ProfileShape, primShape.HollowShape, hollowFactor); 1544 holeHull = BuildHoleHull(primShape, primShape.ProfileShape, hollowShape, hollowFactor);
1545 } 1545 }
1546 1546
1547 if (holeHull != null) 1547 if (holeHull != null)
@@ -1900,6 +1900,8 @@ namespace OpenSim.Region.Physics.Meshing
1900 private static void reportPrimParams(string name, PrimitiveBaseShape primShape) 1900 private static void reportPrimParams(string name, PrimitiveBaseShape primShape)
1901 { 1901 {
1902#if SPAM 1902#if SPAM
1903 float pathShearX = primShape.PathShearX < 128 ? (float)primShape.PathShearX * 0.01f : (float)(primShape.PathShearX - 256) * 0.01f;
1904 float pathShearY = primShape.PathShearY < 128 ? (float)primShape.PathShearY * 0.01f : (float)(primShape.PathShearY - 256) * 0.01f;
1903 1905
1904 Console.WriteLine("********************* PrimitiveBaseShape Parameters *******************\n" 1906 Console.WriteLine("********************* PrimitiveBaseShape Parameters *******************\n"
1905 + "Name.............: " + name.ToString() + "\n" 1907 + "Name.............: " + name.ToString() + "\n"
@@ -1911,8 +1913,8 @@ namespace OpenSim.Region.Physics.Meshing
1911 + "PathRevolutions..: " + primShape.PathRevolutions.ToString() + "\n" 1913 + "PathRevolutions..: " + primShape.PathRevolutions.ToString() + "\n"
1912 + "PathScaleX.......: " + primShape.PathScaleX.ToString() + "\n" 1914 + "PathScaleX.......: " + primShape.PathScaleX.ToString() + "\n"
1913 + "PathScaleY.......: " + primShape.PathScaleY.ToString() + "\n" 1915 + "PathScaleY.......: " + primShape.PathScaleY.ToString() + "\n"
1914 + "PathShearX.......: " + primShape.PathShearX.ToString() + "\n" 1916 + "PathShearX.......: " + primShape.PathShearX.ToString() + " (" + pathShearX.ToString() + ")\n"
1915 + "PathShearY.......: " + primShape.PathShearY.ToString() + "\n" 1917 + "PathShearY.......: " + primShape.PathShearY.ToString() + " (" + pathShearY.ToString() + ")\n"
1916 + "PathSkew.........: " + primShape.PathSkew.ToString() + "\n" 1918 + "PathSkew.........: " + primShape.PathSkew.ToString() + "\n"
1917 + "PathTaperX.......: " + primShape.PathTaperX.ToString() + "\n" 1919 + "PathTaperX.......: " + primShape.PathTaperX.ToString() + "\n"
1918 + "PathTaperY.......: " + primShape.PathTaperY.ToString() + "\n" 1920 + "PathTaperY.......: " + primShape.PathTaperY.ToString() + "\n"