1 files changed, 107 insertions, 25 deletions

diff --git a/OpenSim/Region/Physics/Meshing/PrimMesher.cs b/OpenSim/Region/Physics/Meshing/PrimMesher.cs
index 2a213c3..53022ad 100644
--- a/OpenSim/Region/Physics/Meshing/PrimMesher.cs
+++ b/OpenSim/Region/Physics/Meshing/PrimMesher.cs
@@ -257,7 +257,6 @@ namespace PrimMesher
         public int uv2;
         public int uv3;
 
-
         public Face(int v1, int v2, int v3)
         {
             primFace = 0;
@@ -630,6 +629,9 @@ namespace PrimMesher
         internal int numOuterVerts = 0;
         internal int numHollowVerts = 0;
 
+        internal int outerFaceNumber = -1;
+        internal int hollowFaceNumber = -1;
+
         internal bool calcVertexNormals = false;
         internal int bottomFaceNumber = 0;
         internal int numPrimFaces = 0;
@@ -827,15 +829,16 @@ namespace PrimMesher
 
                 if (createFaces)
                 {
-                    int numOuterVerts = this.coords.Count;
-                    int numHollowVerts = hollowCoords.Count;
-                    int numTotalVerts = numOuterVerts + numHollowVerts;
+                    //int numOuterVerts = this.coords.Count;
+                    //numOuterVerts = this.coords.Count;
+                    //int numHollowVerts = hollowCoords.Count;
+                    int numTotalVerts = this.numOuterVerts + this.numHollowVerts;
 
-                    if (numOuterVerts == numHollowVerts)
+                    if (this.numOuterVerts == this.numHollowVerts)
                     {
                         Face newFace = new Face();
 
-                        for (int coordIndex = 0; coordIndex < numOuterVerts - 1; coordIndex++)
+                        for (int coordIndex = 0; coordIndex < this.numOuterVerts - 1; coordIndex++)
                         {
                             newFace.v1 = coordIndex;
                             newFace.v2 = coordIndex + 1;
@@ -850,12 +853,12 @@ namespace PrimMesher
                     }
                     else
                     {
-                        if (numOuterVerts < numHollowVerts)
+                        if (this.numOuterVerts < this.numHollowVerts)
                         {
                             Face newFace = new Face();
                             int j = 0; // j is the index for outer vertices
-                            int maxJ = numOuterVerts - 1;
-                            for (int i = 0; i < numHollowVerts; i++) // i is the index for inner vertices
+                            int maxJ = this.numOuterVerts - 1;
+                            for (int i = 0; i < this.numHollowVerts; i++) // i is the index for inner vertices
                             {
                                 if (j < maxJ)
                                     if (angles.angles[j + 1].angle - hollowAngles.angles[i].angle < hollowAngles.angles[i].angle - angles.angles[j].angle + 0.000001f)
@@ -879,8 +882,8 @@ namespace PrimMesher
                         {
                             Face newFace = new Face();
                             int j = 0; // j is the index for inner vertices
-                            int maxJ = numHollowVerts - 1;
-                            for (int i = 0; i < numOuterVerts; i++)
+                            int maxJ = this.numHollowVerts - 1;
+                            for (int i = 0; i < this.numOuterVerts; i++)
                             {
                                 if (j < maxJ)
                                     if (hollowAngles.angles[j + 1].angle - angles.angles[i].angle < angles.angles[i].angle - hollowAngles.angles[j].angle + 0.000001f)
@@ -935,10 +938,10 @@ namespace PrimMesher
 
             if (calcVertexNormals && hasProfileCut)
             {
+                int lastOuterVertIndex = this.numOuterVerts - 1;
+
                 if (hasHollow)
                 {
-                    int lastOuterVertIndex = this.numOuterVerts - 1;
-
                     this.cut1CoordIndices.Add(0);
                     this.cut1CoordIndices.Add(this.coords.Count - 1);
 
@@ -954,6 +957,12 @@ namespace PrimMesher
 
                 else
                 {
+                    this.cut1CoordIndices.Add(0);
+                    this.cut1CoordIndices.Add(1);
+
+                    this.cut2CoordIndices.Add(lastOuterVertIndex);
+                    this.cut2CoordIndices.Add(0);
+
                     this.cutNormal1.X = this.vertexNormals[1].Y;
                     this.cutNormal1.Y = -this.vertexNormals[1].X;
 
@@ -978,11 +987,14 @@ namespace PrimMesher
                 // I know it's ugly but so is the whole concept of prim face numbers
 
                 int faceNum = 1; // start with outer faces
+                this.outerFaceNumber = faceNum;
+
                 int startVert = hasProfileCut && !hasHollow ? 1 : 0;
                 if (startVert > 0)
                     this.faceNumbers.Add(-1);
-                for (int i = 0; i < numOuterVerts - 1; i++)
-                    this.faceNumbers.Add(sides < 5 ? faceNum++ : faceNum);
+                for (int i = 0; i < this.numOuterVerts - 1; i++)
+                    //this.faceNumbers.Add(sides < 5 ? faceNum++ : faceNum);
+                    this.faceNumbers.Add(sides < 5 && i < sides ? faceNum++ : faceNum);
 
                 //if (!hasHollow && !hasProfileCut)
                 //    this.bottomFaceNumber = faceNum++;
@@ -992,12 +1004,15 @@ namespace PrimMesher
                 if (sides > 4 && (hasHollow || hasProfileCut))
                     faceNum++;
 
+                if (sides < 5 && (hasHollow || hasProfileCut) && this.numOuterVerts < sides)
+                    faceNum++;
+
                 if (hasHollow)
                 {
-                    for (int i = 0; i < numHollowVerts; i++)
+                    for (int i = 0; i < this.numHollowVerts; i++)
                         this.faceNumbers.Add(faceNum);
 
-                    faceNum++;
+                    this.hollowFaceNumber = faceNum++;
                 }
                 //if (hasProfileCut || hasHollow)
                 //    this.bottomFaceNumber = faceNum++;
@@ -1005,11 +1020,11 @@ namespace PrimMesher
 
                 if (hasHollow && hasProfileCut)
                     this.faceNumbers.Add(faceNum++);
+
                 for (int i = 0; i < this.faceNumbers.Count; i++)
                     if (this.faceNumbers[i] == -1)
                         this.faceNumbers[i] = faceNum++;
 
-
                 this.numPrimFaces = faceNum;
             }
 
@@ -1019,7 +1034,7 @@ namespace PrimMesher
         {
             this.faceUVs = new List<UVCoord>();
             foreach (Coord c in this.coords)
-                this.faceUVs.Add(new UVCoord(1.0f - (0.5f + c.X), 1.0f - (0.5f - c.Y)));
+                this.faceUVs.Add(new UVCoord(0.5f + c.X, 0.5f - c.Y));
         }
 
         internal Profile Copy()
@@ -1348,7 +1363,6 @@ namespace PrimMesher
                 float stepSize = twoPi / this.stepsPerRevolution;
 
                 int step = (int)(startAngle / stepSize);
-//                int firstStep = step;
                 float angle = startAngle;
 
                 bool done = false;
@@ -1455,11 +1469,15 @@ namespace PrimMesher
         public float revolutions = 1.0f;
         public int stepsPerRevolution = 24;
 
+        private int profileOuterFaceNumber = -1;
+        private int profileHollowFaceNumber = -1;
+
         private bool hasProfileCut = false;
         private bool hasHollow = false;
         public bool calcVertexNormals = false;
         private bool normalsProcessed = false;
         public bool viewerMode = false;
+        public bool sphereMode = false;
 
         public int numPrimFaces = 0;
 
@@ -1491,10 +1509,35 @@ namespace PrimMesher
             s += "\nradius...............: " + this.radius.ToString();
             s += "\nrevolutions..........: " + this.revolutions.ToString();
             s += "\nstepsPerRevolution...: " + this.stepsPerRevolution.ToString();
+            s += "\nsphereMode...........: " + this.sphereMode.ToString();
+            s += "\nhasProfileCut........: " + this.hasProfileCut.ToString();
+            s += "\nhasHollow............: " + this.hasHollow.ToString();
+            s += "\nviewerMode...........: " + this.viewerMode.ToString();
 
             return s;
         }
 
+        public int ProfileOuterFaceNumber
+        {
+            get { return profileOuterFaceNumber; }
+        }
+
+        public int ProfileHollowFaceNumber
+        {
+            get { return profileHollowFaceNumber; }
+        }
+
+        public bool HasProfileCut
+        {
+            get { return hasProfileCut; }
+        }
+
+        public bool HasHollow
+        {
+            get { return hasHollow; }
+        }
+
+
         /// <summary>
         /// Constructs a PrimMesh object and creates the profile for extrusion.
         /// </summary>
@@ -1531,8 +1574,12 @@ namespace PrimMesher
             if (hollow < 0.0f)
                 this.hollow = 0.0f;
 
-            this.hasProfileCut = (this.profileStart > 0.0f || this.profileEnd < 1.0f);
-            this.hasHollow = (this.hollow > 0.001f);
+            //if (sphereMode)
+            //    this.hasProfileCut = this.profileEnd - this.profileStart < 0.4999f;
+            //else
+            //    //this.hasProfileCut = (this.profileStart > 0.0f || this.profileEnd < 1.0f);
+            //    this.hasProfileCut = this.profileEnd - this.profileStart < 0.9999f;
+            //this.hasHollow = (this.hollow > 0.001f);
         }
 
         /// <summary>
@@ -1540,6 +1587,8 @@ namespace PrimMesher
         /// </summary>
         public void Extrude(PathType pathType)
         {
+            bool needEndFaces = false;
+
             this.coords = new List<Coord>();
             this.faces = new List<Face>();
 
@@ -1565,6 +1614,12 @@ namespace PrimMesher
                     steps = (int)(steps * 4.5 * length);
             }
 
+            if (sphereMode)
+                this.hasProfileCut = this.profileEnd - this.profileStart < 0.4999f;
+            else
+                //this.hasProfileCut = (this.profileStart > 0.0f || this.profileEnd < 1.0f);
+                this.hasProfileCut = this.profileEnd - this.profileStart < 0.9999f;
+            this.hasHollow = (this.hollow > 0.001f);
 
             float twistBegin = this.twistBegin / 360.0f * twoPi;
             float twistEnd = this.twistEnd / 360.0f * twoPi;
@@ -1634,6 +1689,32 @@ namespace PrimMesher
 
             this.numPrimFaces = profile.numPrimFaces;
 
+            //profileOuterFaceNumber = profile.faceNumbers[0];
+            //if (!needEndFaces)
+            //    profileOuterFaceNumber--;
+            //profileOuterFaceNumber = needEndFaces ? 1 : 0;
+
+
+            //if (hasHollow)
+            //{
+            //    if (needEndFaces)
+            //        profileHollowFaceNumber = profile.faceNumbers[profile.numOuterVerts + 1];
+            //    else
+            //        profileHollowFaceNumber = profile.faceNumbers[profile.numOuterVerts] - 1;
+            //}
+
+
+            profileOuterFaceNumber = profile.outerFaceNumber;
+            if (!needEndFaces)
+                profileOuterFaceNumber--;
+
+            if (hasHollow)
+            {
+                profileHollowFaceNumber = profile.hollowFaceNumber;
+                if (!needEndFaces)
+                    profileHollowFaceNumber--;
+            }
+
             int cut1Vert = -1;
             int cut2Vert = -1;
             if (hasProfileCut)
@@ -1673,7 +1754,7 @@ namespace PrimMesher
 
             path.Create(pathType, steps);
 
-            bool needEndFaces = false;
+
             if (pathType == PathType.Circular)
             {
                 needEndFaces = false;
@@ -1738,7 +1819,6 @@ namespace PrimMesher
                 // append this layer
 
                 int coordsLen = this.coords.Count;
-//                int lastCoordsLen = coordsLen;
                 newLayer.AddValue2FaceVertexIndices(coordsLen);
 
                 this.coords.AddRange(newLayer.coords);
@@ -1762,7 +1842,7 @@ namespace PrimMesher
                     int startVert = coordsLen + 1;
                     int endVert = this.coords.Count;
 
-                    if (sides < 5 || this.hasProfileCut || hollow > 0.0f)
+                    if (sides < 5 || this.hasProfileCut || this.hasHollow)
                         startVert--;
 
                     for (int i = startVert; i < endVert; i++)
@@ -1814,11 +1894,13 @@ namespace PrimMesher
                                     u1 -= (int)u1;
                                     if (u2 < 0.1f)
                                         u2 = 1.0f;
+                                    //this.profileOuterFaceNumber = primFaceNum;
                                 }
                                 else if (whichVert > profile.coords.Count - profile.numHollowVerts - 1)
                                 {
                                     u1 *= 2.0f;
                                     u2 *= 2.0f;
+                                    //this.profileHollowFaceNumber = primFaceNum;
                                 }
                             }