aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDahlia Trimble2008-10-24 20:04:34 +0000
committerDahlia Trimble2008-10-24 20:04:34 +0000
commit71660003de81ad72e991941743c8d685cbca9208 (patch)
tree0afcdf2f3604cc1d5e77a9f3e4b413e6c1e6bff6
parent* Change AddClient test such that we now successfully authenticate (diff)
downloadopensim-SC_OLD-71660003de81ad72e991941743c8d685cbca9208.zip
opensim-SC_OLD-71660003de81ad72e991941743c8d685cbca9208.tar.gz
opensim-SC_OLD-71660003de81ad72e991941743c8d685cbca9208.tar.bz2
opensim-SC_OLD-71660003de81ad72e991941743c8d685cbca9208.tar.xz
un-double-flipped some double-flipped normals in circular path prim end caps
-rw-r--r--OpenSim/Region/Physics/Meshing/PrimMesher.cs44
1 files changed, 2 insertions, 42 deletions
diff --git a/OpenSim/Region/Physics/Meshing/PrimMesher.cs b/OpenSim/Region/Physics/Meshing/PrimMesher.cs
index df1d932..2a019ca 100644
--- a/OpenSim/Region/Physics/Meshing/PrimMesher.cs
+++ b/OpenSim/Region/Physics/Meshing/PrimMesher.cs
@@ -1624,7 +1624,7 @@ namespace PrimMesher
1624 while (!done) // loop through the length of the path and add the layers 1624 while (!done) // loop through the length of the path and add the layers
1625 { 1625 {
1626 bool isEndLayer = false; 1626 bool isEndLayer = false;
1627 if (angle == startAngle || angle >= endAngle) 1627 if (angle <= startAngle + .01f || angle >= endAngle - .01f)
1628 isEndLayer = true; 1628 isEndLayer = true;
1629 1629
1630 //Profile newLayer = profile.Clone(isEndLayer && needEndFaces); 1630 //Profile newLayer = profile.Clone(isEndLayer && needEndFaces);
@@ -1674,10 +1674,7 @@ namespace PrimMesher
1674 newLayer.AddRot(new Quat(new Coord(1.0f, 0.0f, 0.0f), angle + this.topShearY)); 1674 newLayer.AddRot(new Quat(new Coord(1.0f, 0.0f, 0.0f), angle + this.topShearY));
1675 newLayer.AddPos(xOffset, yOffset, zOffset); 1675 newLayer.AddPos(xOffset, yOffset, zOffset);
1676 1676
1677 if (angle == startAngle) 1677 if (isEndLayer && angle <= startAngle + .01f)
1678 newLayer.FlipNormals();
1679
1680 if (angle == startAngle)
1681 { 1678 {
1682 newLayer.FlipNormals(); 1679 newLayer.FlipNormals();
1683 1680
@@ -1749,30 +1746,6 @@ namespace PrimMesher
1749 newFace.v3 = i + 1; 1746 newFace.v3 = i + 1;
1750 this.faces.Add(newFace); 1747 this.faces.Add(newFace);
1751 1748
1752 //if (this.viewerMode)
1753 //{
1754 // // add the side faces to the list of viewerFaces here
1755 // ViewerFace newViewerFace = new ViewerFace();
1756 // newViewerFace.v1 = this.coords[i];
1757 // newViewerFace.v2 = this.coords[i - numVerts];
1758 // newViewerFace.v3 = this.coords[i - numVerts + 1];
1759
1760 // newViewerFace.n1 = this.normals[i];
1761 // newViewerFace.n2 = this.normals[i - numVerts];
1762 // newViewerFace.n3 = this.normals[i - numVerts + 1];
1763
1764 // this.viewerFaces.Add(newViewerFace);
1765
1766 // newViewerFace.v2 = this.coords[i - numVerts + 1];
1767 // newViewerFace.v3 = this.coords[i + 1];
1768
1769 // newViewerFace.n2 = this.normals[i - numVerts + 1];
1770 // newViewerFace.n3 = this.normals[i + 1];
1771
1772 // this.viewerFaces.Add(newViewerFace);
1773
1774 //}
1775
1776 if (this.viewerMode) 1749 if (this.viewerMode)
1777 { 1750 {
1778 // add the side faces to the list of viewerFaces here 1751 // add the side faces to the list of viewerFaces here
@@ -1842,19 +1815,6 @@ namespace PrimMesher
1842 } 1815 }
1843 } 1816 }
1844 1817
1845 //if (this.hasProfileCut)
1846 //{
1847 // newFace.v1 = coordsLen - 1;
1848 // newFace.v2 = coordsLen - numVerts;
1849 // newFace.v3 = coordsLen;
1850 // this.faces.Add(newFace);
1851
1852 // newFace.v1 = coordsLen + numVerts - 1;
1853 // newFace.v2 = coordsLen - 1;
1854 // newFace.v3 = coordsLen;
1855 // this.faces.Add(newFace);
1856 //}
1857
1858 if (this.hasProfileCut) 1818 if (this.hasProfileCut)
1859 { // add the end cut face to the list of viewerFaces here 1819 { // add the end cut face to the list of viewerFaces here
1860 // the first cut face was filled in the above loop 1820 // the first cut face was filled in the above loop