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

Changes selection criteria to allow meshing of more sphere prim configurations. 

Adds comments to some functions in Meshmerizer.cs.
0.6.0-stable
Dahlia Trimble 2008-06-21 08:50:56 +00:00
parent 2758bc81ad
commit 7b4991430b
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1265,7 +1265,13 @@ namespace OpenSim.Region.Physics.Meshing
return result; return result;
} }
/// <summary>
/// builds an icosahedral geodesic sphere - used as default in place of problem meshes
/// </summary>
/// <param name="primName"></param>
/// <param name="primShape"></param>
/// <param name="size"></param>
/// <returns></returns>
private static Mesh CreateSphereMesh(String primName, PrimitiveBaseShape primShape, PhysicsVector size) private static Mesh CreateSphereMesh(String primName, PrimitiveBaseShape primShape, PhysicsVector size)
{ {
// Builds an icosahedral geodesic sphere // Builds an icosahedral geodesic sphere
@ -1394,6 +1400,13 @@ namespace OpenSim.Region.Physics.Meshing
} }
/// <summary>
/// Creates a mesh for prim types torus, ring, tube, and sphere
/// </summary>
/// <param name="primName"></param>
/// <param name="primShape"></param>
/// <param name="size"></param>
/// <returns></returns>
private static Mesh CreateCircularPathMesh(String primName, PrimitiveBaseShape primShape, PhysicsVector size) private static Mesh CreateCircularPathMesh(String primName, PrimitiveBaseShape primShape, PhysicsVector size)
{ {

5
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@ -1547,7 +1547,10 @@ namespace OpenSim.Region.Physics.OdePlugin
if (pbs.ProfileShape == ProfileShape.Circle && pbs.PathCurve == (byte)Extrusion.Straight) if (pbs.ProfileShape == ProfileShape.Circle && pbs.PathCurve == (byte)Extrusion.Straight)
return true; return true;
if (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte)Extrusion.Curve1 && (pbs.Scale.X != pbs.Scale.Y || pbs.Scale.Y != pbs.Scale.Z || pbs.Scale.Z != pbs.Scale.X)) //if (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte)Extrusion.Curve1 && (pbs.Scale.X != pbs.Scale.Y || pbs.Scale.Y != pbs.Scale.Z || pbs.Scale.Z != pbs.Scale.X))
// return true;
if (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte) Extrusion.Curve1)
return true; return true;
// test for torus // test for torus