aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDahlia Trimble2008-06-21 08:50:56 +0000
committerDahlia Trimble2008-06-21 08:50:56 +0000
commit7b4991430b1667ebdab50daa94f23fde958140f6 (patch)
tree6795dcb352c7b84615847b92c7a6a6a16b4e59fd /OpenSim/Region
parent* Persists region banlists across reboots for the sqlite datastore also now. (diff)
downloadopensim-SC_OLD-7b4991430b1667ebdab50daa94f23fde958140f6.zip
opensim-SC_OLD-7b4991430b1667ebdab50daa94f23fde958140f6.tar.gz
opensim-SC_OLD-7b4991430b1667ebdab50daa94f23fde958140f6.tar.bz2
opensim-SC_OLD-7b4991430b1667ebdab50daa94f23fde958140f6.tar.xz
Changes selection criteria to allow meshing of more sphere prim configurations.
Adds comments to some functions in Meshmerizer.cs.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs15
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs5
2 files changed, 18 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index bf6b70c..c9be614 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -1265,7 +1265,13 @@ namespace OpenSim.Region.Physics.Meshing
1265 return result; 1265 return result;
1266 } 1266 }
1267 1267
1268 1268 /// <summary>
1269 /// builds an icosahedral geodesic sphere - used as default in place of problem meshes
1270 /// </summary>
1271 /// <param name="primName"></param>
1272 /// <param name="primShape"></param>
1273 /// <param name="size"></param>
1274 /// <returns></returns>
1269 private static Mesh CreateSphereMesh(String primName, PrimitiveBaseShape primShape, PhysicsVector size) 1275 private static Mesh CreateSphereMesh(String primName, PrimitiveBaseShape primShape, PhysicsVector size)
1270 { 1276 {
1271 // Builds an icosahedral geodesic sphere 1277 // Builds an icosahedral geodesic sphere
@@ -1394,6 +1400,13 @@ namespace OpenSim.Region.Physics.Meshing
1394 1400
1395 } 1401 }
1396 1402
1403 /// <summary>
1404 /// Creates a mesh for prim types torus, ring, tube, and sphere
1405 /// </summary>
1406 /// <param name="primName"></param>
1407 /// <param name="primShape"></param>
1408 /// <param name="size"></param>
1409 /// <returns></returns>
1397 private static Mesh CreateCircularPathMesh(String primName, PrimitiveBaseShape primShape, PhysicsVector size) 1410 private static Mesh CreateCircularPathMesh(String primName, PrimitiveBaseShape primShape, PhysicsVector size)
1398 { 1411 {
1399 1412
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 81e03ca..edb6375 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1547,7 +1547,10 @@ namespace OpenSim.Region.Physics.OdePlugin
1547 1547
1548 if (pbs.ProfileShape == ProfileShape.Circle && pbs.PathCurve == (byte)Extrusion.Straight) 1548 if (pbs.ProfileShape == ProfileShape.Circle && pbs.PathCurve == (byte)Extrusion.Straight)
1549 return true; 1549 return true;
1550 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)) 1550 //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))
1551 // return true;
1552
1553 if (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte) Extrusion.Curve1)
1551 return true; 1554 return true;
1552 1555
1553 // test for torus 1556 // test for torus