diff options
author | Jeff Ames | 2008-05-30 08:35:57 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-30 08:35:57 +0000 |
commit | 04625109560fb54d613b1fc9c81a8a9f387720c9 (patch) | |
tree | af00035a676beee3542a55cd13ce09e57f1ad778 /OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |
parent | thanks krtaylor for a (diff) | |
download | opensim-SC_OLD-04625109560fb54d613b1fc9c81a8a9f387720c9.zip opensim-SC_OLD-04625109560fb54d613b1fc9c81a8a9f387720c9.tar.gz opensim-SC_OLD-04625109560fb54d613b1fc9c81a8a9f387720c9.tar.bz2 opensim-SC_OLD-04625109560fb54d613b1fc9c81a8a9f387720c9.tar.xz |
Update svn properties. Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Physics/Meshing/Meshmerizer.cs')
-rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index 5ef392c..3fbc7c9 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
@@ -255,7 +255,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
255 | holeHull.AddVertex(IPM); | 255 | holeHull.AddVertex(IPM); |
256 | } | 256 | } |
257 | //if (hshape == HollowShape.Circle && pbs.PathCurve == (byte)Extrusion.Straight) | 257 | //if (hshape == HollowShape.Circle && pbs.PathCurve == (byte)Extrusion.Straight) |
258 | if ( hshape == HollowShape.Circle ) | 258 | if (hshape == HollowShape.Circle) |
259 | { | 259 | { |
260 | float hollowFactorF = (float)fhollowFactor / (float)50000; | 260 | float hollowFactorF = (float)fhollowFactor / (float)50000; |
261 | 261 | ||
@@ -1346,7 +1346,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
1346 | // || (primShape.ProfileCurve & 0x07) == (byte) ProfileShape.Square) | 1346 | // || (primShape.ProfileCurve & 0x07) == (byte) ProfileShape.Square) |
1347 | { | 1347 | { |
1348 | //Console.WriteLine("Meshmerizer thinks " + primName + " is a TORUS"); | 1348 | //Console.WriteLine("Meshmerizer thinks " + primName + " is a TORUS"); |
1349 | if ( hollowShape == HollowShape.Same ) | 1349 | if (hollowShape == HollowShape.Same) |
1350 | hollowShape = HollowShape.Circle; | 1350 | hollowShape = HollowShape.Circle; |
1351 | 1351 | ||
1352 | // build the profile shape | 1352 | // build the profile shape |
@@ -1381,7 +1381,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
1381 | else if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.Square) // a ring | 1381 | else if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.Square) // a ring |
1382 | { | 1382 | { |
1383 | //Console.WriteLine("Meshmerizer thinks " + primName + " is a TUBE"); | 1383 | //Console.WriteLine("Meshmerizer thinks " + primName + " is a TUBE"); |
1384 | if ( hollowShape == HollowShape.Same ) | 1384 | if (hollowShape == HollowShape.Same) |
1385 | hollowShape = HollowShape.Square; | 1385 | hollowShape = HollowShape.Square; |
1386 | 1386 | ||
1387 | outerHull.AddVertex(new Vertex(+0.5f, +0.5f, 0.0f)); | 1387 | outerHull.AddVertex(new Vertex(+0.5f, +0.5f, 0.0f)); |
@@ -1393,7 +1393,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
1393 | else if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.EquilateralTriangle) | 1393 | else if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.EquilateralTriangle) |
1394 | { | 1394 | { |
1395 | //Console.WriteLine("Meshmerizer thinks " + primName + " is a RING"); | 1395 | //Console.WriteLine("Meshmerizer thinks " + primName + " is a RING"); |
1396 | if ( hollowShape == HollowShape.Same ) | 1396 | if (hollowShape == HollowShape.Same) |
1397 | hollowShape = HollowShape.Triangle; | 1397 | hollowShape = HollowShape.Triangle; |
1398 | 1398 | ||
1399 | outerHull.AddVertex(new Vertex(+0.255f, -0.375f, 0.0f)); | 1399 | outerHull.AddVertex(new Vertex(+0.255f, -0.375f, 0.0f)); |