diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/Meshing/SimpleHull.cs | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/Meshing/SimpleHull.cs b/OpenSim/Region/Physics/Meshing/SimpleHull.cs index 4532bda..9209860 100644 --- a/OpenSim/Region/Physics/Meshing/SimpleHull.cs +++ b/OpenSim/Region/Physics/Meshing/SimpleHull.cs | |||
@@ -42,6 +42,8 @@ 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); | ||
46 | |||
45 | private List<Vertex> vertices = new List<Vertex>(); | 47 | private List<Vertex> vertices = new List<Vertex>(); |
46 | 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 |
47 | 49 | ||
@@ -243,9 +245,9 @@ namespace OpenSim.Region.Physics.Meshing | |||
243 | SimpleHull otherHullClone = otherHull.Clone(); | 245 | SimpleHull otherHullClone = otherHull.Clone(); |
244 | bool intersects = false; | 246 | bool intersects = false; |
245 | 247 | ||
246 | MainLog.Instance.Debug("State before intersection detection"); | 248 | m_log.Debug("State before intersection detection"); |
247 | MainLog.Instance.Debug("The baseHull is:\n{1}", 0, baseHullClone.ToString()); | 249 | m_log.Debug(String.Format("The baseHull is:\n{1}", 0, baseHullClone.ToString())); |
248 | MainLog.Instance.Debug("The otherHull is:\n{1}", 0, otherHullClone.ToString()); | 250 | m_log.Debug(String.Format("The otherHull is:\n{1}", 0, otherHullClone.ToString())); |
249 | 251 | ||
250 | { | 252 | { |
251 | int iBase, iOther; | 253 | int iBase, iOther; |
@@ -274,8 +276,8 @@ namespace OpenSim.Region.Physics.Meshing | |||
274 | } | 276 | } |
275 | } | 277 | } |
276 | 278 | ||
277 | MainLog.Instance.Debug("State after intersection detection for the base hull"); | 279 | m_log.Debug("State after intersection detection for the base hull"); |
278 | MainLog.Instance.Debug("The baseHull is:\n{1}", 0, baseHullClone.ToString()); | 280 | m_log.Debug(String.Format("The baseHull is:\n{1}", 0, baseHullClone.ToString())); |
279 | 281 | ||
280 | { | 282 | { |
281 | int iOther, iBase; | 283 | int iOther, iBase; |
@@ -303,8 +305,8 @@ namespace OpenSim.Region.Physics.Meshing | |||
303 | } | 305 | } |
304 | } | 306 | } |
305 | 307 | ||
306 | MainLog.Instance.Debug("State after intersection detection for the base hull"); | 308 | m_log.Debug("State after intersection detection for the base hull"); |
307 | MainLog.Instance.Debug("The otherHull is:\n{1}", 0, otherHullClone.ToString()); | 309 | m_log.Debug(String.Format("The otherHull is:\n{1}", 0, otherHullClone.ToString())); |
308 | 310 | ||
309 | 311 | ||
310 | bool otherIsInBase = baseHullClone.containsPointsFrom(otherHullClone); | 312 | bool otherIsInBase = baseHullClone.containsPointsFrom(otherHullClone); |
@@ -387,7 +389,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
387 | done = true; | 389 | done = true; |
388 | } | 390 | } |
389 | 391 | ||
390 | MainLog.Instance.Debug("The resulting Hull is:\n{1}", 0, result.ToString()); | 392 | m_log.Debug(String.Format("The resulting Hull is:\n{1}", 0, result.ToString())); |
391 | 393 | ||
392 | return result; | 394 | return result; |
393 | } | 395 | } |