diff options
| author | Jeff Ames | 2008-08-28 14:41:54 +0000 |
|---|---|---|
| committer | Jeff Ames | 2008-08-28 14:41:54 +0000 |
| commit | 3bf88587277b83c0b6f058fabba7d46a3b5a6a00 (patch) | |
| tree | ed4ad9dc27e649a6f52661665fb681984251f480 /OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |
| parent | Thannk you, Ralphos, for a patch the corrects an improper cast in (diff) | |
| download | opensim-SC_OLD-3bf88587277b83c0b6f058fabba7d46a3b5a6a00.zip opensim-SC_OLD-3bf88587277b83c0b6f058fabba7d46a3b5a6a00.tar.gz opensim-SC_OLD-3bf88587277b83c0b6f058fabba7d46a3b5a6a00.tar.bz2 opensim-SC_OLD-3bf88587277b83c0b6f058fabba7d46a3b5a6a00.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 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index a66a1b1..7cf8b76 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
| @@ -1890,9 +1890,9 @@ namespace OpenSim.Region.Physics.Meshing | |||
| 1890 | else if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.HalfCircle) | 1890 | else if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.HalfCircle) |
| 1891 | { // half circle, prim is a sphere | 1891 | { // half circle, prim is a sphere |
| 1892 | sides = 24; | 1892 | sides = 24; |
| 1893 | 1893 | ||
| 1894 | profileBegin = 0.5f * profileBegin + 0.5f; | 1894 | profileBegin = 0.5f * profileBegin + 0.5f; |
| 1895 | profileEnd = 0.5f * profileEnd + 0.5f; | 1895 | profileEnd = 0.5f * profileEnd + 0.5f; |
| 1896 | 1896 | ||
| 1897 | //profileHollow = 0.0f; // debugging only | 1897 | //profileHollow = 0.0f; // debugging only |
| 1898 | } | 1898 | } |
| @@ -1904,7 +1904,6 @@ namespace OpenSim.Region.Physics.Meshing | |||
| 1904 | hollowSides = 4; | 1904 | hollowSides = 4; |
| 1905 | else if (primShape.HollowShape == HollowShape.Triangle) | 1905 | else if (primShape.HollowShape == HollowShape.Triangle) |
| 1906 | hollowSides = 3; | 1906 | hollowSides = 3; |
| 1907 | |||
| 1908 | 1907 | ||
| 1909 | PrimMesh primMesh = new PrimMesh(sides, profileBegin, profileEnd, profileHollow, hollowSides); | 1908 | PrimMesh primMesh = new PrimMesh(sides, profileBegin, profileEnd, profileHollow, hollowSides); |
| 1910 | //PrimMesh primMesh = new PrimMesh(sides, profileBegin, profileEnd, 0.0f, 4); | 1909 | //PrimMesh primMesh = new PrimMesh(sides, profileBegin, profileEnd, 0.0f, 4); |