OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ubMeshmerizer: remove some wrong faces still present in taper cases, some code cleanup

LSLKeyTest
UbitUmarov 2015-12-26 21:38:36 +00:00
parent 6427930a7e
commit e2517b51f8
3 changed files with 234 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs
View File

@ -234,9 +234,12 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
triangle.v3.Y = (float)Math.Round(triangle.v3.Y, 6); triangle.v3.Y = (float)Math.Round(triangle.v3.Y, 6);
triangle.v3.Z = (float)Math.Round(triangle.v3.Z, 6); triangle.v3.Z = (float)Math.Round(triangle.v3.Z, 6);
if ((triangle.v1.X == triangle.v2.X && triangle.v1.Y == triangle.v2.Y && triangle.v1.Z == triangle.v2.Z) if ((triangle.v1.X == triangle.v2.X && triangle.v1.Y == triangle.v2.Y && triangle.v1.Z ==
|| (triangle.v1.X == triangle.v3.X && triangle.v1.Y == triangle.v3.Y && triangle.v1.Z == triangle.v3.Z) triangle.v2.Z)
|| (triangle.v2.X == triangle.v3.X && triangle.v2.Y == triangle.v3.Y && triangle.v2.Z == triangle.v3.Z) || (triangle.v1.X == triangle.v3.X && triangle.v1.Y == triangle.v3.Y && triangle.v1.Z ==
triangle.v3.Z)
|| (triangle.v2.X == triangle.v3.X && triangle.v2.Y == triangle.v3.Y && triangle.v2.Z ==
triangle.v3.Z)
) )
{ {
return; return;

24
OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
View File

@ -121,6 +121,22 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
CacheExpire = TimeSpan.FromHours(fcache); CacheExpire = TimeSpan.FromHours(fcache);
if(doMeshFileCache && cachePath != "")
{
lock (diskLock)
{
try
{
if (!Directory.Exists(cachePath))
Directory.CreateDirectory(cachePath);
}
catch
{
doMeshFileCache = false;
doCacheExpire = false;
}
}
}
} }
} }
@ -972,6 +988,14 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
primMesh.taperX = primShape.PathTaperX * 0.01f; primMesh.taperX = primShape.PathTaperX * 0.01f;
primMesh.taperY = primShape.PathTaperY * 0.01f; primMesh.taperY = primShape.PathTaperY * 0.01f;
if(profshape == (byte)ProfileShape.HalfCircle)
{
if(primMesh.holeSizeY < 0.01f)
primMesh.holeSizeY = 0.01f;
else if(primMesh.holeSizeY > 1.0f)
primMesh.holeSizeY = 1.0f;
}
#if SPAM #if SPAM
m_log.Debug("****** PrimMesh Parameters (Circular) ******\n" + primMesh.ParamsToDisplayString()); m_log.Debug("****** PrimMesh Parameters (Circular) ******\n" + primMesh.ParamsToDisplayString());
#endif #endif

401
OpenSim/Region/PhysicsModules/ubOdeMeshing/PrimMesher.cs
View File

@ -241,7 +241,6 @@ namespace PrimMesher
this.v1 = v1; this.v1 = v1;
this.v2 = v2; this.v2 = v2;
this.v3 = v3; this.v3 = v3;
} }
public Coord SurfaceNormal(List<Coord> coordList) public Coord SurfaceNormal(List<Coord> coordList)
@ -516,16 +515,16 @@ namespace PrimMesher
public Profile() public Profile()
{ {
this.coords = new List<Coord>(); coords = new List<Coord>();
this.faces = new List<Face>(); faces = new List<Face>();
} }
public Profile(int sides, float profileStart, float profileEnd, float hollow, int hollowSides, bool hasProfileCut, bool createFaces) public Profile(int sides, float profileStart, float profileEnd, float hollow, int hollowSides, bool hasProfileCut, bool createFaces)
{ {
const float halfSqr2 = 0.7071067811866f; const float halfSqr2 = 0.7071067811866f;
this.coords = new List<Coord>(); coords = new List<Coord>();
this.faces = new List<Face>(); faces = new List<Face>();
List<Coord> hollowCoords = new List<Coord>(); List<Coord> hollowCoords = new List<Coord>();
@ -555,7 +554,7 @@ namespace PrimMesher
return; return;
} }
this.numOuterVerts = angles.angles.Count; numOuterVerts = angles.angles.Count;
Angle angle; Angle angle;
Coord newVert = new Coord(); Coord newVert = new Coord();
@ -589,7 +588,7 @@ namespace PrimMesher
hollowCoords.Add(newVert); hollowCoords.Add(newVert);
} }
} }
this.numHollowVerts = hollowAngles.angles.Count; numHollowVerts = hollowAngles.angles.Count;
} }
else if (!simpleFace) else if (!simpleFace)
{ {
@ -606,7 +605,7 @@ namespace PrimMesher
newVert.X = angle.X * xScale; newVert.X = angle.X * xScale;
newVert.Y = angle.Y * yScale; newVert.Y = angle.Y * yScale;
newVert.Z = 0.0f; newVert.Z = 0.0f;
this.coords.Add(newVert); coords.Add(newVert);
if (hollowsame) if (hollowsame)
{ {
newVert.X *= hollow; newVert.X *= hollow;
@ -618,49 +617,49 @@ namespace PrimMesher
if (hasHollow) if (hasHollow)
{ {
hollowCoords.Reverse(); hollowCoords.Reverse();
this.coords.AddRange(hollowCoords); coords.AddRange(hollowCoords);
if (createFaces) if (createFaces)
{ {
int numTotalVerts = this.numOuterVerts + this.numHollowVerts; int numTotalVerts = numOuterVerts + numHollowVerts;
if (this.numOuterVerts == this.numHollowVerts) if (numOuterVerts == numHollowVerts)
{ {
Face newFace = new Face(); Face newFace = new Face();
for (int coordIndex = 0; coordIndex < this.numOuterVerts - 1; coordIndex++) for (int coordIndex = 0; coordIndex < numOuterVerts - 1; coordIndex++)
{ {
newFace.v1 = coordIndex; newFace.v1 = coordIndex;
newFace.v2 = coordIndex + 1; newFace.v2 = coordIndex + 1;
newFace.v3 = numTotalVerts - coordIndex - 1; newFace.v3 = numTotalVerts - coordIndex - 1;
this.faces.Add(newFace); faces.Add(newFace);
newFace.v1 = coordIndex + 1; newFace.v1 = coordIndex + 1;
newFace.v2 = numTotalVerts - coordIndex - 2; newFace.v2 = numTotalVerts - coordIndex - 2;
newFace.v3 = numTotalVerts - coordIndex - 1; newFace.v3 = numTotalVerts - coordIndex - 1;
this.faces.Add(newFace); faces.Add(newFace);
} }
if (!hasProfileCut) if (!hasProfileCut)
{ {
newFace.v1 = this.numOuterVerts - 1; newFace.v1 = numOuterVerts - 1;
newFace.v2 = 0; newFace.v2 = 0;
newFace.v3 = this.numOuterVerts; newFace.v3 = numOuterVerts;
this.faces.Add(newFace); faces.Add(newFace);
newFace.v1 = 0; newFace.v1 = 0;
newFace.v2 = numTotalVerts - 1; newFace.v2 = numTotalVerts - 1;
newFace.v3 = this.numOuterVerts; newFace.v3 = numOuterVerts;
this.faces.Add(newFace); faces.Add(newFace);
} }
} }
else if (this.numOuterVerts < this.numHollowVerts) else if (numOuterVerts < numHollowVerts)
{ {
Face newFace = new Face(); Face newFace = new Face();
int j = 0; // j is the index for outer vertices int j = 0; // j is the index for outer vertices
int i; int i;
int maxJ = this.numOuterVerts - 1; int maxJ = numOuterVerts - 1;
float curHollowAngle = 0; float curHollowAngle = 0;
for (i = 0; i < this.numHollowVerts; i++) // i is the index for inner vertices for (i = 0; i < numHollowVerts; i++) // i is the index for inner vertices
{ {
curHollowAngle = hollowAngles.angles[i].angle; curHollowAngle = hollowAngles.angles[i].angle;
if (j < maxJ) if (j < maxJ)
@ -670,7 +669,7 @@ namespace PrimMesher
newFace.v1 = numTotalVerts - i - 1; newFace.v1 = numTotalVerts - i - 1;
newFace.v2 = j; newFace.v2 = j;
newFace.v3 = j + 1; newFace.v3 = j + 1;
this.faces.Add(newFace); faces.Add(newFace);
j++; j++;
} }
} }
@ -684,18 +683,18 @@ namespace PrimMesher
newFace.v2 = numTotalVerts - i - 2; newFace.v2 = numTotalVerts - i - 2;
newFace.v3 = numTotalVerts - i - 1; newFace.v3 = numTotalVerts - i - 1;
this.faces.Add(newFace); faces.Add(newFace);
} }
if (!hasProfileCut) if (!hasProfileCut)
{ {
if (i == this.numHollowVerts) if (i == numHollowVerts)
{ {
newFace.v1 = numTotalVerts - this.numHollowVerts; newFace.v1 = numTotalVerts - numHollowVerts;
newFace.v2 = maxJ; newFace.v2 = maxJ;
newFace.v3 = 0; newFace.v3 = 0;
this.faces.Add(newFace); faces.Add(newFace);
} }
else else
{ {
@ -705,31 +704,31 @@ namespace PrimMesher
newFace.v2 = maxJ; newFace.v2 = maxJ;
newFace.v3 = 0; newFace.v3 = 0;
this.faces.Add(newFace); faces.Add(newFace);
} }
for (; i < this.numHollowVerts - 1; i++) for (; i < numHollowVerts - 1; i++)
{ {
newFace.v1 = 0; newFace.v1 = 0;
newFace.v2 = numTotalVerts - i - 2; newFace.v2 = numTotalVerts - i - 2;
newFace.v3 = numTotalVerts - i - 1; newFace.v3 = numTotalVerts - i - 1;
this.faces.Add(newFace); faces.Add(newFace);
} }
} }
newFace.v1 = 0; newFace.v1 = 0;
newFace.v2 = numTotalVerts - this.numHollowVerts; newFace.v2 = numTotalVerts - numHollowVerts;
newFace.v3 = numTotalVerts - 1; newFace.v3 = numTotalVerts - 1;
this.faces.Add(newFace); faces.Add(newFace);
} }
} }
else // numHollowVerts < numOuterVerts else // numHollowVerts < numOuterVerts
{ {
Face newFace = new Face(); Face newFace = new Face();
int j = 0; // j is the index for inner vertices int j = 0; // j is the index for inner vertices
int maxJ = this.numHollowVerts - 1; int maxJ = numHollowVerts - 1;
for (int i = 0; i < this.numOuterVerts; i++) for (int i = 0; i < numOuterVerts; i++)
{ {
if (j < maxJ) if (j < maxJ)
if (hollowAngles.angles[j + 1].angle - angles.angles[i].angle < angles.angles[i].angle - hollowAngles.angles[j].angle + 0.000001f) if (hollowAngles.angles[j + 1].angle - angles.angles[i].angle < angles.angles[i].angle - hollowAngles.angles[j].angle + 0.000001f)
@ -738,7 +737,7 @@ namespace PrimMesher
newFace.v2 = numTotalVerts - j - 2; newFace.v2 = numTotalVerts - j - 2;
newFace.v3 = numTotalVerts - j - 1; newFace.v3 = numTotalVerts - j - 1;
this.faces.Add(newFace); faces.Add(newFace);
j += 1; j += 1;
} }
@ -746,12 +745,12 @@ namespace PrimMesher
newFace.v2 = i; newFace.v2 = i;
newFace.v3 = i + 1; newFace.v3 = i + 1;
this.faces.Add(newFace); faces.Add(newFace);
} }
if (!hasProfileCut) if (!hasProfileCut)
{ {
int i = this.numOuterVerts - 1; int i = numOuterVerts - 1;
if (hollowAngles.angles[0].angle - angles.angles[i].angle < angles.angles[i].angle - hollowAngles.angles[maxJ].angle + 0.000001f) if (hollowAngles.angles[0].angle - angles.angles[i].angle < angles.angles[i].angle - hollowAngles.angles[maxJ].angle + 0.000001f)
{ {
@ -759,14 +758,14 @@ namespace PrimMesher
newFace.v2 = numTotalVerts - maxJ - 1; newFace.v2 = numTotalVerts - maxJ - 1;
newFace.v3 = numTotalVerts - 1; newFace.v3 = numTotalVerts - 1;
this.faces.Add(newFace); faces.Add(newFace);
} }
newFace.v1 = numTotalVerts - maxJ - 1; newFace.v1 = numTotalVerts - maxJ - 1;
newFace.v2 = i; newFace.v2 = i;
newFace.v3 = 0; newFace.v3 = 0;
this.faces.Add(newFace); faces.Add(newFace);
} }
} }
} }
@ -778,11 +777,11 @@ namespace PrimMesher
if (simpleFace) if (simpleFace)
{ {
if (sides == 3) if (sides == 3)
this.faces.Add(new Face(0, 1, 2)); faces.Add(new Face(0, 1, 2));
else if (sides == 4) else if (sides == 4)
{ {
this.faces.Add(new Face(0, 1, 2)); faces.Add(new Face(0, 1, 2));
this.faces.Add(new Face(0, 2, 3)); faces.Add(new Face(0, 2, 3));
} }
} }
else else
@ -793,7 +792,7 @@ namespace PrimMesher
newFace.v1 = 0; newFace.v1 = 0;
newFace.v2 = i; newFace.v2 = i;
newFace.v3 = i + 1; newFace.v3 = i + 1;
this.faces.Add(newFace); faces.Add(newFace);
} }
if (!hasProfileCut) if (!hasProfileCut)
{ {
@ -801,7 +800,7 @@ namespace PrimMesher
newFace.v1 = 0; newFace.v1 = 0;
newFace.v2 = numAngles; newFace.v2 = numAngles;
newFace.v3 = 1; newFace.v3 = 1;
this.faces.Add(newFace); faces.Add(newFace);
} }
} }
} }
@ -813,20 +812,20 @@ namespace PrimMesher
public Profile Copy() public Profile Copy()
{ {
return this.Copy(true); return Copy(true);
} }
public Profile Copy(bool needFaces) public Profile Copy(bool needFaces)
{ {
Profile copy = new Profile(); Profile copy = new Profile();
copy.coords.AddRange(this.coords); copy.coords.AddRange(coords);
if (needFaces) if (needFaces)
copy.faces.AddRange(this.faces); copy.faces.AddRange(faces);
copy.numOuterVerts = this.numOuterVerts; copy.numOuterVerts = numOuterVerts;
copy.numHollowVerts = this.numHollowVerts; copy.numHollowVerts = numHollowVerts;
return copy; return copy;
} }
@ -839,12 +838,12 @@ namespace PrimMesher
public void AddPos(float x, float y, float z) public void AddPos(float x, float y, float z)
{ {
int i; int i;
int numVerts = this.coords.Count; int numVerts = coords.Count;
Coord vert; Coord vert;
for (i = 0; i < numVerts; i++) for (i = 0; i < numVerts; i++)
{ {
vert = this.coords[i]; vert = coords[i];
vert.X += x; vert.X += x;
vert.Y += y; vert.Y += y;
vert.Z += z; vert.Z += z;
@ -855,25 +854,30 @@ namespace PrimMesher
public void AddRot(Quat q) public void AddRot(Quat q)
{ {
int i; int i;
int numVerts = this.coords.Count; int numVerts = coords.Count;
for (i = 0; i < numVerts; i++) for (i = 0; i < numVerts; i++)
this.coords[i] *= q; coords[i] *= q;
} }
public void Scale(float x, float y) public void Scale(float x, float y)
{ {
int i; int i;
int numVerts = this.coords.Count; int numVerts = coords.Count;
Coord vert; Coord vert;
for (i = 0; i < numVerts; i++) for (i = 0; i < numVerts; i++)
{ {
vert = this.coords[i]; vert = coords[i];
vert.X *= x; vert.X *= x;
vert.X = (float)Math.Round(vert.X,5);
vert.Y *= y; vert.Y *= y;
this.coords[i] = vert; vert.Y = (float)Math.Round(vert.Y,5);
coords[i] = vert;
} }
if(x == 0f || y == 0f)
faces = new List<Face>();
} }
/// <summary> /// <summary>
@ -881,33 +885,40 @@ namespace PrimMesher
/// </summary> /// </summary>
public void FlipNormals() public void FlipNormals()
{ {
int numFaces = faces.Count;
if(numFaces == 0)
return;
int i; int i;
int numFaces = this.faces.Count;
Face tmpFace; Face tmpFace;
int tmp; int tmp;
for (i = 0; i < numFaces; i++) for (i = 0; i < numFaces; i++)
{ {
tmpFace = this.faces[i]; tmpFace = faces[i];
tmp = tmpFace.v3; tmp = tmpFace.v3;
tmpFace.v3 = tmpFace.v1; tmpFace.v3 = tmpFace.v1;
tmpFace.v1 = tmp; tmpFace.v1 = tmp;
this.faces[i] = tmpFace; faces[i] = tmpFace;
} }
} }
public void AddValue2FaceVertexIndices(int num) public void AddValue2FaceVertexIndices(int num)
{ {
int numFaces = this.faces.Count; int numFaces = faces.Count;
if(numFaces == 0)
return;
Face tmpFace; Face tmpFace;
for (int i = 0; i < numFaces; i++) for (int i = 0; i < numFaces; i++)
{ {
tmpFace = this.faces[i]; tmpFace = faces[i];
tmpFace.v1 += num; tmpFace.v1 += num;
tmpFace.v2 += num; tmpFace.v2 += num;
tmpFace.v3 += num; tmpFace.v3 += num;
this.faces[i] = tmpFace; faces[i] = tmpFace;
} }
} }
@ -919,11 +930,11 @@ namespace PrimMesher
String completePath = System.IO.Path.Combine(path, fileName); String completePath = System.IO.Path.Combine(path, fileName);
StreamWriter sw = new StreamWriter(completePath); StreamWriter sw = new StreamWriter(completePath);
for (int i = 0; i < this.faces.Count; i++) for (int i = 0; i < faces.Count; i++)
{ {
string s = this.coords[this.faces[i].v1].ToString(); string s = coords[faces[i].v1].ToString();
s += " " + this.coords[this.faces[i].v2].ToString(); s += " " + coords[faces[i].v2].ToString();
s += " " + this.coords[this.faces[i].v3].ToString(); s += " " + coords[faces[i].v3].ToString();
sw.WriteLine(s); sw.WriteLine(s);
} }
@ -968,20 +979,20 @@ namespace PrimMesher
public void Create(PathType pathType, int steps) public void Create(PathType pathType, int steps)
{ {
if (this.taperX > 0.999f) if (taperX > .9999f)
this.taperX = 0.999f; taperX = 1.0f;
if (this.taperX < -0.999f) else if (taperX < -.9999f)
this.taperX = -0.999f; taperX = -1.0f;
if (this.taperY > 0.999f) if (taperY > .9999f)
this.taperY = 0.999f; taperY = 1.0f;
if (this.taperY < -0.999f) else if (taperY < -.9999f)
this.taperY = -0.999f; taperY = -1.0f;
if (pathType == PathType.Linear || pathType == PathType.Flexible) if (pathType == PathType.Linear || pathType == PathType.Flexible)
{ {
int step = 0; int step = 0;
float length = this.pathCutEnd - this.pathCutBegin; float length = pathCutEnd - pathCutBegin;
float twistTotal = twistEnd - twistBegin; float twistTotal = twistEnd - twistBegin;
float twistTotalAbs = Math.Abs(twistTotal); float twistTotalAbs = Math.Abs(twistTotal);
if (twistTotalAbs > 0.01f) if (twistTotalAbs > 0.01f)
@ -990,13 +1001,13 @@ namespace PrimMesher
float start = -0.5f; float start = -0.5f;
float stepSize = length / (float)steps; float stepSize = length / (float)steps;
float percentOfPathMultiplier = stepSize * 0.999999f; float percentOfPathMultiplier = stepSize * 0.999999f;
float xOffset = this.topShearX * this.pathCutBegin; float xOffset = topShearX * pathCutBegin;
float yOffset = this.topShearY * this.pathCutBegin; float yOffset = topShearY * pathCutBegin;
float zOffset = start; float zOffset = start;
float xOffsetStepIncrement = this.topShearX * length / steps; float xOffsetStepIncrement = topShearX * length / steps;
float yOffsetStepIncrement = this.topShearY * length / steps; float yOffsetStepIncrement = topShearY * length / steps;
float percentOfPath = this.pathCutBegin; float percentOfPath = pathCutBegin;
zOffset += percentOfPath; zOffset += percentOfPath;
// sanity checks // sanity checks
@ -1008,18 +1019,16 @@ namespace PrimMesher
PathNode newNode = new PathNode(); PathNode newNode = new PathNode();
newNode.xScale = 1.0f; newNode.xScale = 1.0f;
if (this.taperX == 0.0f) if (taperX > 0.0f)
newNode.xScale = 1.0f; newNode.xScale -= percentOfPath * taperX;
else if (this.taperX > 0.0f) else if(taperX < 0.0f)
newNode.xScale = 1.0f - percentOfPath * this.taperX; newNode.xScale += (1.0f - percentOfPath) * taperX;
else newNode.xScale = 1.0f + (1.0f - percentOfPath) * this.taperX;
newNode.yScale = 1.0f; newNode.yScale = 1.0f;
if (this.taperY == 0.0f) if (taperY > 0.0f)
newNode.yScale = 1.0f; newNode.yScale -= percentOfPath * taperY;
else if (this.taperY > 0.0f) else if(taperY < 0.0f)
newNode.yScale = 1.0f - percentOfPath * this.taperY; newNode.yScale += (1.0f - percentOfPath) * taperY;
else newNode.yScale = 1.0f + (1.0f - percentOfPath) * this.taperY;
float twist = twistBegin + twistTotal * percentOfPath; float twist = twistBegin + twistTotal * percentOfPath;
@ -1036,7 +1045,7 @@ namespace PrimMesher
xOffset += xOffsetStepIncrement; xOffset += xOffsetStepIncrement;
yOffset += yOffsetStepIncrement; yOffset += yOffsetStepIncrement;
zOffset += stepSize; zOffset += stepSize;
if (percentOfPath > this.pathCutEnd) if (percentOfPath > pathCutEnd)
done = true; done = true;
} }
else done = true; else done = true;
@ -1059,12 +1068,12 @@ namespace PrimMesher
steps *= 2; steps *= 2;
} }
float yPathScale = this.holeSizeY * 0.5f; float yPathScale = holeSizeY * 0.5f;
float pathLength = this.pathCutEnd - this.pathCutBegin; float pathLength = pathCutEnd - pathCutBegin;
float totalSkew = this.skew * 2.0f * pathLength; float totalSkew = skew * 2.0f * pathLength;
float skewStart = this.pathCutBegin * 2.0f * this.skew - this.skew; float skewStart = pathCutBegin * 2.0f * skew - skew;
float xOffsetTopShearXFactor = this.topShearX * (0.25f + 0.5f * (0.5f - this.holeSizeY)); float xOffsetTopShearXFactor = topShearX * (0.25f + 0.5f * (0.5f - holeSizeY));
float yShearCompensation = 1.0f + Math.Abs(this.topShearY) * 0.25f; float yShearCompensation = 1.0f + Math.Abs(topShearY) * 0.25f;
// It's not quite clear what pushY (Y top shear) does, but subtracting it from the start and end // It's not quite clear what pushY (Y top shear) does, but subtracting it from the start and end
// angles appears to approximate it's effects on path cut. Likewise, adding it to the angle used // angles appears to approximate it's effects on path cut. Likewise, adding it to the angle used
@ -1074,9 +1083,9 @@ namespace PrimMesher
// the meshes generated with this technique appear nearly identical in shape to the same prims when // the meshes generated with this technique appear nearly identical in shape to the same prims when
// displayed by the viewer. // displayed by the viewer.
float startAngle = (twoPi * this.pathCutBegin * this.revolutions) - this.topShearY * 0.9f; float startAngle = (twoPi * pathCutBegin * revolutions) - topShearY * 0.9f;
float endAngle = (twoPi * this.pathCutEnd * this.revolutions) - this.topShearY * 0.9f; float endAngle = (twoPi * pathCutEnd * revolutions) - topShearY * 0.9f;
float stepSize = twoPi / this.stepsPerRevolution; float stepSize = twoPi / stepsPerRevolution;
int step = (int)(startAngle / stepSize); int step = (int)(startAngle / stepSize);
float angle = startAngle; float angle = startAngle;
@ -1086,30 +1095,30 @@ namespace PrimMesher
{ {
PathNode newNode = new PathNode(); PathNode newNode = new PathNode();
float xProfileScale = (1.0f - Math.Abs(this.skew)) * this.holeSizeX; float xProfileScale = (1.0f - Math.Abs(skew)) * holeSizeX;
float yProfileScale = this.holeSizeY; float yProfileScale = holeSizeY;
float percentOfPath = angle / (twoPi * this.revolutions); float percentOfPath = angle / (twoPi * revolutions);
float percentOfAngles = (angle - startAngle) / (endAngle - startAngle); float percentOfAngles = (angle - startAngle) / (endAngle - startAngle);
if (this.taperX > 0.01f) if (taperX > 0.01f)
xProfileScale *= 1.0f - percentOfPath * this.taperX; xProfileScale *= 1.0f - percentOfPath * taperX;
else if (this.taperX < -0.01f) else if (taperX < -0.01f)
xProfileScale *= 1.0f + (1.0f - percentOfPath) * this.taperX; xProfileScale *= 1.0f + (1.0f - percentOfPath) * taperX;
if (this.taperY > 0.01f) if (taperY > 0.01f)
yProfileScale *= 1.0f - percentOfPath * this.taperY; yProfileScale *= 1.0f - percentOfPath * taperY;
else if (this.taperY < -0.01f) else if (taperY < -0.01f)
yProfileScale *= 1.0f + (1.0f - percentOfPath) * this.taperY; yProfileScale *= 1.0f + (1.0f - percentOfPath) * taperY;
newNode.xScale = xProfileScale; newNode.xScale = xProfileScale;
newNode.yScale = yProfileScale; newNode.yScale = yProfileScale;
float radiusScale = 1.0f; float radiusScale = 1.0f;
if (this.radius > 0.001f) if (radius > 0.001f)
radiusScale = 1.0f - this.radius * percentOfPath; radiusScale = 1.0f - radius * percentOfPath;
else if (this.radius < 0.001f) else if (radius < 0.001f)
radiusScale = 1.0f + this.radius * (1.0f - percentOfPath); radiusScale = 1.0f + radius * (1.0f - percentOfPath);
float twist = twistBegin + twistTotal * percentOfPath; float twist = twistBegin + twistTotal * percentOfPath;
@ -1118,14 +1127,14 @@ namespace PrimMesher
float yOffset = yShearCompensation * (float)Math.Cos(angle) * (0.5f - yPathScale) * radiusScale; float yOffset = yShearCompensation * (float)Math.Cos(angle) * (0.5f - yPathScale) * radiusScale;
float zOffset = (float)Math.Sin(angle + this.topShearY) * (0.5f - yPathScale) * radiusScale; float zOffset = (float)Math.Sin(angle + topShearY) * (0.5f - yPathScale) * radiusScale;
newNode.position = new Coord(xOffset, yOffset, zOffset); newNode.position = new Coord(xOffset, yOffset, zOffset);
// now orient the rotation of the profile layer relative to it's position on the path // now orient the rotation of the profile layer relative to it's position on the path
// adding taperY to the angle used to generate the quat appears to approximate the viewer // adding taperY to the angle used to generate the quat appears to approximate the viewer
newNode.rotation = new Quat(new Coord(1.0f, 0.0f, 0.0f), angle + this.topShearY); newNode.rotation = new Quat(new Coord(1.0f, 0.0f, 0.0f), angle + topShearY);
// next apply twist rotation to the profile layer // next apply twist rotation to the profile layer
if (twistTotal != 0.0f || twistBegin != 0.0f) if (twistTotal != 0.0f || twistBegin != 0.0f)
@ -1243,33 +1252,33 @@ namespace PrimMesher
/// <param name="hollow"></param> /// <param name="hollow"></param>
/// <param name="hollowSides"></param> /// <param name="hollowSides"></param>
/// <param name="sphereMode"></param> /// <param name="sphereMode"></param>
public PrimMesh(int sides, float profileStart, float profileEnd, float hollow, int hollowSides) public PrimMesh(int _sides, float _profileStart, float _profileEnd, float _hollow, int _hollowSides)
{ {
this.coords = new List<Coord>(); coords = new List<Coord>();
this.faces = new List<Face>(); faces = new List<Face>();
this.sides = sides; sides = _sides;
this.profileStart = profileStart; profileStart = _profileStart;
this.profileEnd = profileEnd; profileEnd = _profileEnd;
this.hollow = hollow; hollow = _hollow;
this.hollowSides = hollowSides; hollowSides = _hollowSides;
if (sides < 3) if (sides < 3)
this.sides = 3; sides = 3;
if (hollowSides < 3) if (hollowSides < 3)
this.hollowSides = 3; hollowSides = 3;
if (profileStart < 0.0f) if (profileStart < 0.0f)
this.profileStart = 0.0f; profileStart = 0.0f;
if (profileEnd > 1.0f) if (profileEnd > 1.0f)
this.profileEnd = 1.0f; profileEnd = 1.0f;
if (profileEnd < 0.02f) if (profileEnd < 0.02f)
this.profileEnd = 0.02f; profileEnd = 0.02f;
if (profileStart >= profileEnd) if (profileStart >= profileEnd)
this.profileStart = profileEnd - 0.02f; profileStart = profileEnd - 0.02f;
if (hollow > 0.99f) if (hollow > 0.99f)
this.hollow = 0.99f; hollow = 0.99f;
if (hollow < 0.0f) if (hollow < 0.0f)
this.hollow = 0.0f; hollow = 0.0f;
} }
/// <summary> /// <summary>
@ -1279,16 +1288,16 @@ namespace PrimMesher
{ {
bool needEndFaces = false; bool needEndFaces = false;
this.coords = new List<Coord>(); coords = new List<Coord>();
this.faces = new List<Face>(); faces = new List<Face>();
int steps = 1; int steps = 1;
float length = this.pathCutEnd - this.pathCutBegin; float length = pathCutEnd - pathCutBegin;
this.hasProfileCut = this.profileEnd - this.profileStart < 0.9999f; hasProfileCut = this.profileEnd - this.profileStart < 0.9999f;
this.hasHollow = (this.hollow > 0.001f); hasHollow = (this.hollow > 0.001f);
float twistBegin = this.twistBegin / 360.0f * twoPi; float twistBegin = this.twistBegin / 360.0f * twoPi;
float twistEnd = this.twistEnd / 360.0f * twoPi; float twistEnd = this.twistEnd / 360.0f * twoPi;
@ -1298,31 +1307,30 @@ namespace PrimMesher
steps += (int)(twistTotalAbs * 3.66); // dahlia's magic number steps += (int)(twistTotalAbs * 3.66); // dahlia's magic number
float hollow = this.hollow; float hollow = this.hollow;
float initialProfileRot = 0.0f;
if (pathType == PathType.Circular) if (pathType == PathType.Circular)
{ {
needEndFaces = false; needEndFaces = false;
if (this.pathCutBegin != 0.0f || this.pathCutEnd != 1.0f) if (pathCutBegin != 0.0f || pathCutEnd != 1.0f)
needEndFaces = true; needEndFaces = true;
else if (this.taperX != 0.0f || this.taperY != 0.0f) else if (taperX != 0.0f || taperY != 0.0f)
needEndFaces = true; needEndFaces = true;
else if (this.skew != 0.0f) else if (skew != 0.0f)
needEndFaces = true; needEndFaces = true;
else if (twistTotal != 0.0f) else if (twistTotal != 0.0f)
needEndFaces = true; needEndFaces = true;
else if (this.radius != 0.0f) else if (radius != 0.0f)
needEndFaces = true; needEndFaces = true;
} }
else needEndFaces = true; else needEndFaces = true;
// sanity checks
float initialProfileRot = 0.0f;
if (pathType == PathType.Circular) if (pathType == PathType.Circular)
{ {
if (this.sides == 3) if (sides == 3)
{ {
initialProfileRot = (float)Math.PI; initialProfileRot = (float)Math.PI;
if (this.hollowSides == 4) if (hollowSides == 4)
{ {
if (hollow > 0.7f) if (hollow > 0.7f)
hollow = 0.7f; hollow = 0.7f;
@ -1330,16 +1338,16 @@ namespace PrimMesher
} }
else hollow *= 0.5f; else hollow *= 0.5f;
} }
else if (this.sides == 4) else if (sides == 4)
{ {
initialProfileRot = 0.25f * (float)Math.PI; initialProfileRot = 0.25f * (float)Math.PI;
if (this.hollowSides != 4) if (hollowSides != 4)
hollow *= 0.707f; hollow *= 0.707f;
} }
else if (this.sides > 4) else if (sides > 4)
{ {
initialProfileRot = (float)Math.PI; initialProfileRot = (float)Math.PI;
if (this.hollowSides == 4) if (hollowSides == 4)
{ {
if (hollow > 0.7f) if (hollow > 0.7f)
hollow = 0.7f; hollow = 0.7f;
@ -1349,9 +1357,9 @@ namespace PrimMesher
} }
else else
{ {
if (this.sides == 3) if (sides == 3)
{ {
if (this.hollowSides == 4) if (hollowSides == 4)
{ {
if (hollow > 0.7f) if (hollow > 0.7f)
hollow = 0.7f; hollow = 0.7f;
@ -1359,29 +1367,27 @@ namespace PrimMesher
} }
else hollow *= 0.5f; else hollow *= 0.5f;
} }
else if (this.sides == 4) else if (sides == 4)
{ {
initialProfileRot = 1.25f * (float)Math.PI; initialProfileRot = 1.25f * (float)Math.PI;
if (this.hollowSides != 4) if (hollowSides != 4)
hollow *= 0.707f; hollow *= 0.707f;
} }
else if (this.sides == 24 && this.hollowSides == 4) else if (sides == 24 && hollowSides == 4)
hollow *= 1.414f; hollow *= 1.414f;
} }
Profile profile = new Profile(this.sides, this.profileStart, this.profileEnd, hollow, this.hollowSides, this.hasProfileCut,true); Profile profile = new Profile(sides, profileStart, profileEnd, hollow, hollowSides,
this.errorMessage = profile.errorMessage; HasProfileCut,true);
errorMessage = profile.errorMessage;
this.numPrimFaces = profile.numPrimFaces; numPrimFaces = profile.numPrimFaces;
if (initialProfileRot != 0.0f) if (initialProfileRot != 0.0f)
{ {
profile.AddRot(new Quat(new Coord(0.0f, 0.0f, 1.0f), initialProfileRot)); profile.AddRot(new Quat(new Coord(0.0f, 0.0f, 1.0f), initialProfileRot));
} }
float thisV = 0.0f;
float lastV = 0.0f;
Path path = new Path(); Path path = new Path();
path.twistBegin = twistBegin; path.twistBegin = twistBegin;
path.twistEnd = twistEnd; path.twistEnd = twistEnd;
@ -1413,42 +1419,29 @@ namespace PrimMesher
newLayer.AddRot(node.rotation); newLayer.AddRot(node.rotation);
newLayer.AddPos(node.position); newLayer.AddPos(node.position);
if (needEndFaces && nodeIndex == 0)
{
newLayer.FlipNormals();
} // if (nodeIndex == 0)
// append this layer // append this layer
int coordsStart = coords.Count;
coords.AddRange(newLayer.coords);
int coordsLen = this.coords.Count; if (needEndFaces && nodeIndex == 0 && newLayer.faces.Count > 0)
newLayer.AddValue2FaceVertexIndices(coordsLen);
this.coords.AddRange(newLayer.coords);
if (needEndFaces)
{ {
if (nodeIndex == 0) newLayer.AddValue2FaceVertexIndices(coordsStart);
this.faces.AddRange(newLayer.faces); newLayer.FlipNormals();
else if (nodeIndex == lastNode) faces.AddRange(newLayer.faces);
{
if (node.xScale > 1e-6 && node.yScale > 1e-6)
this.faces.AddRange(newLayer.faces);
}
} }
// fill faces between layers // fill faces between layers
List<Face> linkfaces = new List<Face>();
int numVerts = newLayer.coords.Count; int numVerts = newLayer.coords.Count;
Face newFace1 = new Face(); Face newFace1 = new Face();
Face newFace2 = new Face(); Face newFace2 = new Face();
thisV = 1.0f - node.percentOfPath;
if (nodeIndex > 0) if (nodeIndex > 0)
{ {
int startVert = coordsLen; int startVert = coordsStart;
int endVert = this.coords.Count; int endVert = coords.Count;
if (!this.hasProfileCut) if (!hasProfileCut)
{ {
if(numVerts > 5 && !hasHollow) if(numVerts > 5 && !hasHollow)
startVert++; startVert++;
@ -1458,26 +1451,26 @@ namespace PrimMesher
newFace1.v1 = i; newFace1.v1 = i;
newFace1.v2 = i - numVerts; newFace1.v2 = i - numVerts;
newFace1.v3 = i + 1; newFace1.v3 = i + 1;
this.faces.Add(newFace1); linkfaces.Add(newFace1);
newFace2.v1 = i + 1; newFace2.v1 = i + 1;
newFace2.v2 = i - numVerts; newFace2.v2 = i - numVerts;
newFace2.v3 = i + 1 - numVerts; newFace2.v3 = i + 1 - numVerts;
this.faces.Add(newFace2); linkfaces.Add(newFace2);
i++; i++;
} }
newFace1.v1 = i; newFace1.v1 = i;
newFace1.v2 = i - numVerts; newFace1.v2 = i - numVerts;
newFace1.v3 = startVert; newFace1.v3 = startVert;
this.faces.Add(newFace1); linkfaces.Add(newFace1);
newFace2.v1 = startVert; newFace2.v1 = startVert;
newFace2.v2 = i - numVerts; newFace2.v2 = i - numVerts;
newFace2.v3 = startVert - numVerts; newFace2.v3 = startVert - numVerts;
this.faces.Add(newFace2); linkfaces.Add(newFace2);
if (this.hasHollow) if (hasHollow)
{ {
startVert = ++i; startVert = ++i;
for (int l = 0; l < profile.numHollowVerts - 1; l++) for (int l = 0; l < profile.numHollowVerts - 1; l++)
@ -1485,27 +1478,25 @@ namespace PrimMesher
newFace1.v1 = i; newFace1.v1 = i;
newFace1.v2 = i - numVerts; newFace1.v2 = i - numVerts;
newFace1.v3 = i + 1; newFace1.v3 = i + 1;
this.faces.Add(newFace1); linkfaces.Add(newFace1);
newFace2.v1 = i + 1; newFace2.v1 = i + 1;
newFace2.v2 = i - numVerts; newFace2.v2 = i - numVerts;
newFace2.v3 = i + 1 - numVerts; newFace2.v3 = i + 1 - numVerts;
this.faces.Add(newFace2); linkfaces.Add(newFace2);
i++; i++;
} }
newFace1.v1 = i; newFace1.v1 = i;
newFace1.v2 = i - numVerts; newFace1.v2 = i - numVerts;
newFace1.v3 = startVert; newFace1.v3 = startVert;
this.faces.Add(newFace1); linkfaces.Add(newFace1);
newFace2.v1 = startVert; newFace2.v1 = startVert;
newFace2.v2 = i - numVerts; newFace2.v2 = i - numVerts;
newFace2.v3 = startVert - numVerts; newFace2.v3 = startVert - numVerts;
this.faces.Add(newFace2); linkfaces.Add(newFace2);
} }
} }
else else
{ {
@ -1518,21 +1509,27 @@ namespace PrimMesher
newFace1.v1 = i; newFace1.v1 = i;
newFace1.v2 = i - numVerts; newFace1.v2 = i - numVerts;
newFace1.v3 = iNext; newFace1.v3 = iNext;
this.faces.Add(newFace1); linkfaces.Add(newFace1);
newFace2.v1 = iNext; newFace2.v1 = iNext;
newFace2.v2 = i - numVerts; newFace2.v2 = i - numVerts;
newFace2.v3 = iNext - numVerts; newFace2.v3 = iNext - numVerts;
this.faces.Add(newFace2); linkfaces.Add(newFace2);
} }
} }
} }
lastV = thisV; if(linkfaces.Count > 0)
faces.AddRange(linkfaces);
if (needEndFaces && nodeIndex == lastNode && newLayer.faces.Count > 0)
{
newLayer.AddValue2FaceVertexIndices(coordsStart);
faces.AddRange(newLayer.faces);
}
} // for (int nodeIndex = 0; nodeIndex < path.pathNodes.Count; nodeIndex++) } // for (int nodeIndex = 0; nodeIndex < path.pathNodes.Count; nodeIndex++)
// more cleanup will be done at Meshmerizer.cs
} }
@ -1543,7 +1540,7 @@ namespace PrimMesher
/// ///
public void ExtrudeLinear() public void ExtrudeLinear()
{ {
this.Extrude(PathType.Linear); Extrude(PathType.Linear);
} }
@ -1554,7 +1551,7 @@ namespace PrimMesher
/// ///
public void ExtrudeCircular() public void ExtrudeCircular()
{ {
this.Extrude(PathType.Circular); Extrude(PathType.Circular);
} }