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

reverting to prior meshing methods until some physics timing issues can be resolved

0.6.0-stable
Dahlia Trimble 2008-08-27 09:49:13 +00:00
parent 65c82c2494
commit 36d1720fde
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
View File

@ -52,6 +52,8 @@ namespace OpenSim.Region.Physics.Meshing
public class Meshmerizer : IMesher public class Meshmerizer : IMesher
{ {
private bool usePrimMesher = false;
//private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
// Setting baseDir to a path will enable the dumping of raw files // Setting baseDir to a path will enable the dumping of raw files
@ -2010,7 +2012,7 @@ namespace OpenSim.Region.Physics.Meshing
//CalcNormals(mesh); //CalcNormals(mesh);
} }
else if (true) else if (usePrimMesher)
{ {
mesh = CreateMeshFromPrimMesher(primName, primShape, size, lod); mesh = CreateMeshFromPrimMesher(primName, primShape, size, lod);
} }
@ -2018,15 +2020,15 @@ namespace OpenSim.Region.Physics.Meshing
{ {
if (primShape.PathCurve == (byte)Extrusion.Straight) if (primShape.PathCurve == (byte)Extrusion.Straight)
{ // its a box { // its a box
//mesh = CreateBoxMesh(primName, primShape, size); mesh = CreateBoxMesh(primName, primShape, size);
mesh = CreateMeshFromPrimMesher(primName, primShape, size, lod); //mesh = CreateMeshFromPrimMesher(primName, primShape, size, lod);
//CalcNormals(mesh); //CalcNormals(mesh);
} }
else if (primShape.PathCurve == (byte)Extrusion.Curve1) else if (primShape.PathCurve == (byte)Extrusion.Curve1)
{ // tube { // tube
// do a cylinder for now // do a cylinder for now
//mesh = CreateCylinderMesh(primName, primShape, size); mesh = CreateCylinderMesh(primName, primShape, size);
mesh = CreateMeshFromPrimMesher(primName, primShape, size, lod); //mesh = CreateMeshFromPrimMesher(primName, primShape, size, lod);
//CalcNormals(mesh); //CalcNormals(mesh);
} }
} }
@ -2034,16 +2036,16 @@ namespace OpenSim.Region.Physics.Meshing
{ {
if (primShape.PathCurve == (byte)Extrusion.Straight) if (primShape.PathCurve == (byte)Extrusion.Straight)
{ {
//mesh = CreateCylinderMesh(primName, primShape, size); mesh = CreateCylinderMesh(primName, primShape, size);
mesh = CreateMeshFromPrimMesher(primName, primShape, size, lod); //mesh = CreateMeshFromPrimMesher(primName, primShape, size, lod);
//CalcNormals(mesh); //CalcNormals(mesh);
} }
// ProfileCurve seems to combine hole shape and profile curve so we need to only compare against the lower 3 bits // ProfileCurve seems to combine hole shape and profile curve so we need to only compare against the lower 3 bits
else if (primShape.PathCurve == (byte) Extrusion.Curve1) else if (primShape.PathCurve == (byte) Extrusion.Curve1)
{ // dahlia's favorite, a torus :) { // dahlia's favorite, a torus :)
//mesh = CreateCircularPathMesh(primName, primShape, size); mesh = CreateCircularPathMesh(primName, primShape, size);
mesh = CreateMeshFromPrimMesher(primName, primShape, size, lod); //mesh = CreateMeshFromPrimMesher(primName, primShape, size, lod);
//CalcNormals(mesh); //CalcNormals(mesh);
} }
} }
@ -2052,8 +2054,8 @@ namespace OpenSim.Region.Physics.Meshing
if (primShape.PathCurve == (byte)Extrusion.Curve1 || primShape.PathCurve == (byte) Extrusion.Curve2) if (primShape.PathCurve == (byte)Extrusion.Curve1 || primShape.PathCurve == (byte) Extrusion.Curve2)
{ {
//mesh = CreateSphereMesh(primName, primShape, size); //mesh = CreateSphereMesh(primName, primShape, size);
//mesh = CreateCircularPathMesh(primName, primShape, size); mesh = CreateCircularPathMesh(primName, primShape, size);
mesh = CreateMeshFromPrimMesher(primName, primShape, size, lod); //mesh = CreateMeshFromPrimMesher(primName, primShape, size, lod);
//CalcNormals(mesh); //CalcNormals(mesh);
} }
} }
@ -2061,15 +2063,15 @@ namespace OpenSim.Region.Physics.Meshing
{ {
if (primShape.PathCurve == (byte)Extrusion.Straight) if (primShape.PathCurve == (byte)Extrusion.Straight)
{ {
//mesh = CreatePrismMesh(primName, primShape, size); mesh = CreatePrismMesh(primName, primShape, size);
mesh = CreateMeshFromPrimMesher(primName, primShape, size, lod); //mesh = CreateMeshFromPrimMesher(primName, primShape, size, lod);
//CalcNormals(mesh); //CalcNormals(mesh);
} }
else if (primShape.PathCurve == (byte) Extrusion.Curve1) else if (primShape.PathCurve == (byte) Extrusion.Curve1)
{ // a ring - do a cylinder for now { // a ring - do a cylinder for now
//mesh = CreateCylinderMesh(primName, primShape, size); //mesh = CreateCylinderMesh(primName, primShape, size);
//mesh = CreateCircularPathMesh(primName, primShape, size); mesh = CreateCircularPathMesh(primName, primShape, size);
mesh = CreateMeshFromPrimMesher(primName, primShape, size, lod); //mesh = CreateMeshFromPrimMesher(primName, primShape, size, lod);
//CalcNormals(mesh); //CalcNormals(mesh);
} }
} }