diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index 984114b..f041aec 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
@@ -30,7 +30,6 @@ using System; | |||
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Region.Physics.Manager; | 32 | using OpenSim.Region.Physics.Manager; |
33 | using libsecondlife; | ||
34 | 33 | ||
35 | namespace OpenSim.Region.Physics.Meshing | 34 | namespace OpenSim.Region.Physics.Meshing |
36 | { | 35 | { |
@@ -1883,12 +1882,12 @@ namespace OpenSim.Region.Physics.Meshing | |||
1883 | } | 1882 | } |
1884 | else if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.Square) | 1883 | else if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.Square) |
1885 | { | 1884 | { |
1886 | if (primShape.PathCurve == (byte)LLObject.PathCurve.Line) | 1885 | if (primShape.PathCurve == (byte)Extrusion.Straight) |
1887 | { // its a box | 1886 | { // its a box |
1888 | mesh = CreateBoxMesh(primName, primShape, size); | 1887 | mesh = CreateBoxMesh(primName, primShape, size); |
1889 | CalcNormals(mesh); | 1888 | CalcNormals(mesh); |
1890 | } | 1889 | } |
1891 | else if (primShape.PathCurve == (byte)LLObject.PathCurve.Circle) | 1890 | else if (primShape.PathCurve == (byte)Extrusion.Curve1) |
1892 | { // tube | 1891 | { // tube |
1893 | // do a cylinder for now | 1892 | // do a cylinder for now |
1894 | //mesh = CreateCylinderMesh(primName, primShape, size); | 1893 | //mesh = CreateCylinderMesh(primName, primShape, size); |
@@ -1904,9 +1903,8 @@ namespace OpenSim.Region.Physics.Meshing | |||
1904 | CalcNormals(mesh); | 1903 | CalcNormals(mesh); |
1905 | } | 1904 | } |
1906 | 1905 | ||
1907 | // look at LLObject.cs in libsecondlife for how to know the prim type | ||
1908 | // ProfileCurve seems to combine hole shape and profile curve so we need to only compare against the lower 3 bits | 1906 | // ProfileCurve seems to combine hole shape and profile curve so we need to only compare against the lower 3 bits |
1909 | else if (primShape.PathCurve == (byte) Extrusion.Curve1 && LLObject.UnpackPathScale(primShape.PathScaleY) <= 0.75f) | 1907 | else if (primShape.PathCurve == (byte) Extrusion.Curve1) |
1910 | { // dahlia's favorite, a torus :) | 1908 | { // dahlia's favorite, a torus :) |
1911 | mesh = CreateCircularPathMesh(primName, primShape, size); | 1909 | mesh = CreateCircularPathMesh(primName, primShape, size); |
1912 | CalcNormals(mesh); | 1910 | CalcNormals(mesh); |