diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/Meshing/SimpleHull.cs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/Physics/Meshing/SimpleHull.cs b/OpenSim/Region/Physics/Meshing/SimpleHull.cs index 91df98f..58b9a0e 100644 --- a/OpenSim/Region/Physics/Meshing/SimpleHull.cs +++ b/OpenSim/Region/Physics/Meshing/SimpleHull.cs | |||
@@ -42,7 +42,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
42 | // is defined by the hull lies inside or outside the simplex chain | 42 | // is defined by the hull lies inside or outside the simplex chain |
43 | public class SimpleHull | 43 | public class SimpleHull |
44 | { | 44 | { |
45 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 45 | //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
46 | 46 | ||
47 | private List<Vertex> vertices = new List<Vertex>(); | 47 | private List<Vertex> vertices = new List<Vertex>(); |
48 | private List<Vertex> holeVertices = new List<Vertex>(); // Only used, when the hull is hollow | 48 | private List<Vertex> holeVertices = new List<Vertex>(); // Only used, when the hull is hollow |
@@ -228,8 +228,8 @@ namespace OpenSim.Region.Physics.Meshing | |||
228 | distToV1 = distTemp; | 228 | distToV1 = distTemp; |
229 | bestIntersectingSimplex = sTest; | 229 | bestIntersectingSimplex = sTest; |
230 | } | 230 | } |
231 | } // end if vTemp | 231 | } |
232 | } // end foreach | 232 | } |
233 | 233 | ||
234 | Intersection = bestIntersection; | 234 | Intersection = bestIntersection; |
235 | if (bestIntersectingSimplex != null) | 235 | if (bestIntersectingSimplex != null) |
@@ -308,7 +308,6 @@ namespace OpenSim.Region.Physics.Meshing | |||
308 | //m_log.Debug("State after intersection detection for the base hull"); | 308 | //m_log.Debug("State after intersection detection for the base hull"); |
309 | //m_log.DebugFormat("The otherHull is:\n{1}", 0, otherHullClone.ToString()); | 309 | //m_log.DebugFormat("The otherHull is:\n{1}", 0, otherHullClone.ToString()); |
310 | 310 | ||
311 | |||
312 | bool otherIsInBase = baseHullClone.containsPointsFrom(otherHullClone); | 311 | bool otherIsInBase = baseHullClone.containsPointsFrom(otherHullClone); |
313 | if (!intersects && otherIsInBase) | 312 | if (!intersects && otherIsInBase) |
314 | { | 313 | { |
@@ -317,7 +316,6 @@ namespace OpenSim.Region.Physics.Meshing | |||
317 | return baseHullClone; | 316 | return baseHullClone; |
318 | } | 317 | } |
319 | 318 | ||
320 | |||
321 | SimpleHull result = new SimpleHull(); | 319 | SimpleHull result = new SimpleHull(); |
322 | 320 | ||
323 | // Find a good starting Simplex from baseHull | 321 | // Find a good starting Simplex from baseHull |
@@ -394,4 +392,4 @@ namespace OpenSim.Region.Physics.Meshing | |||
394 | return result; | 392 | return result; |
395 | } | 393 | } |
396 | } | 394 | } |
397 | } \ No newline at end of file | 395 | } |