diff options
author | Dahlia Trimble | 2008-10-24 23:37:09 +0000 |
---|---|---|
committer | Dahlia Trimble | 2008-10-24 23:37:09 +0000 |
commit | 3447bed8be494c09d6df02efde328183a4d1a988 (patch) | |
tree | 678864f7697d3d835b390e0676aa390cdb5402cd | |
parent | Plumb some more (diff) | |
download | opensim-SC_OLD-3447bed8be494c09d6df02efde328183a4d1a988.zip opensim-SC_OLD-3447bed8be494c09d6df02efde328183a4d1a988.tar.gz opensim-SC_OLD-3447bed8be494c09d6df02efde328183a4d1a988.tar.bz2 opensim-SC_OLD-3447bed8be494c09d6df02efde328183a4d1a988.tar.xz |
Add end faces when radius setting is non-zero
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/Meshing/PrimMesher.cs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/Meshing/PrimMesher.cs b/OpenSim/Region/Physics/Meshing/PrimMesher.cs index bec1495..3f7d40c 100644 --- a/OpenSim/Region/Physics/Meshing/PrimMesher.cs +++ b/OpenSim/Region/Physics/Meshing/PrimMesher.cs | |||
@@ -976,7 +976,7 @@ namespace PrimMesher | |||
976 | this.faceNormal.Y = -this.faceNormal.Y; | 976 | this.faceNormal.Y = -this.faceNormal.Y; |
977 | this.faceNormal.Z = -this.faceNormal.Z; | 977 | this.faceNormal.Z = -this.faceNormal.Z; |
978 | 978 | ||
979 | //int numUs = this.us.Count; | 979 | int numUs = this.us.Count; |
980 | //for (int i = 0; i < numUs; i++) | 980 | //for (int i = 0; i < numUs; i++) |
981 | // this.us[i] | 981 | // this.us[i] |
982 | 982 | ||
@@ -1598,13 +1598,15 @@ namespace PrimMesher | |||
1598 | } | 1598 | } |
1599 | 1599 | ||
1600 | bool needEndFaces = false; | 1600 | bool needEndFaces = false; |
1601 | if (this.pathCutBegin != 0.0 || this.pathCutEnd != 1.0) | 1601 | if (this.pathCutBegin != 0.0f || this.pathCutEnd != 1.0f) |
1602 | needEndFaces = true; | 1602 | needEndFaces = true; |
1603 | else if (this.taperX != 0.0 || this.taperY != 0.0) | 1603 | else if (this.taperX != 0.0f || this.taperY != 0.0f) |
1604 | needEndFaces = true; | 1604 | needEndFaces = true; |
1605 | else if (this.skew != 0.0) | 1605 | else if (this.skew != 0.0f) |
1606 | needEndFaces = true; | 1606 | needEndFaces = true; |
1607 | else if (twistTotal != 0.0) | 1607 | else if (twistTotal != 0.0f) |
1608 | needEndFaces = true; | ||
1609 | else if (this.radius != 0.0f) | ||
1608 | needEndFaces = true; | 1610 | needEndFaces = true; |
1609 | 1611 | ||
1610 | Profile profile = new Profile(this.sides, this.profileStart, this.profileEnd, hollow, this.hollowSides, needEndFaces, calcVertexNormals); | 1612 | Profile profile = new Profile(this.sides, this.profileStart, this.profileEnd, hollow, this.hollowSides, needEndFaces, calcVertexNormals); |
@@ -1928,6 +1930,7 @@ namespace PrimMesher | |||
1928 | 1930 | ||
1929 | public Coord SurfaceNormal(int faceIndex) | 1931 | public Coord SurfaceNormal(int faceIndex) |
1930 | { | 1932 | { |
1933 | int numFaces = faces.Count; | ||
1931 | if (faceIndex < 0 || faceIndex >= faces.Count) | 1934 | if (faceIndex < 0 || faceIndex >= faces.Count) |
1932 | throw new Exception("faceIndex out of range"); | 1935 | throw new Exception("faceIndex out of range"); |
1933 | 1936 | ||