diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODETestClass.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 8 |
4 files changed, 15 insertions, 11 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 16e0efe..9991ab1 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
@@ -669,7 +669,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
669 | m_pidControllerActive = false; | 669 | m_pidControllerActive = false; |
670 | force *= 100f; | 670 | force *= 100f; |
671 | doForce(force); | 671 | doForce(force); |
672 | //System.Console.WriteLine("Push!"); | 672 | //m_log.Debug("Push!"); |
673 | //_target_velocity.X += force.X; | 673 | //_target_velocity.X += force.X; |
674 | // _target_velocity.Y += force.Y; | 674 | // _target_velocity.Y += force.Y; |
675 | //_target_velocity.Z += force.Z; | 675 | //_target_velocity.Z += force.Z; |
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index bfb9b1a..6d07b92 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -2507,7 +2507,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2507 | } | 2507 | } |
2508 | else | 2508 | else |
2509 | { | 2509 | { |
2510 | //System.Console.WriteLine(Math.Abs(m_lastposition.X - l_position.X).ToString()); | 2510 | //m_log.Debug(Math.Abs(m_lastposition.X - l_position.X).ToString()); |
2511 | _zeroFlag = false; | 2511 | _zeroFlag = false; |
2512 | } | 2512 | } |
2513 | 2513 | ||
@@ -2569,7 +2569,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2569 | m_rotationalVelocity.setValues(rotvel.X, rotvel.Y, rotvel.Z); | 2569 | m_rotationalVelocity.setValues(rotvel.X, rotvel.Y, rotvel.Z); |
2570 | } | 2570 | } |
2571 | 2571 | ||
2572 | //System.Console.WriteLine("ODE: " + m_rotationalVelocity.ToString()); | 2572 | //m_log.Debug("ODE: " + m_rotationalVelocity.ToString()); |
2573 | _orientation.X = ori.X; | 2573 | _orientation.X = ori.X; |
2574 | _orientation.Y = ori.Y; | 2574 | _orientation.Y = ori.Y; |
2575 | _orientation.Z = ori.Z; | 2575 | _orientation.Z = ori.Z; |
diff --git a/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs b/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs index c913639..6ee23db 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs | |||
@@ -31,12 +31,16 @@ using NUnit.Framework; | |||
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Region.Physics.Manager; | 33 | using OpenSim.Region.Physics.Manager; |
34 | using log4net; | ||
35 | using System.Reflection; | ||
34 | 36 | ||
35 | namespace OpenSim.Region.Physics.OdePlugin | 37 | namespace OpenSim.Region.Physics.OdePlugin |
36 | { | 38 | { |
37 | [TestFixture] | 39 | [TestFixture] |
38 | public class ODETestClass | 40 | public class ODETestClass |
39 | { | 41 | { |
42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
43 | |||
40 | private OdePlugin cbt; | 44 | private OdePlugin cbt; |
41 | private PhysicsScene ps; | 45 | private PhysicsScene ps; |
42 | private IMeshingPlugin imp; | 46 | private IMeshingPlugin imp; |
@@ -92,18 +96,18 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
92 | Assert.That(oprim.m_targetSpace != (IntPtr)0); | 96 | Assert.That(oprim.m_targetSpace != (IntPtr)0); |
93 | 97 | ||
94 | //Assert.That(oprim.m_targetSpace == pscene.space); | 98 | //Assert.That(oprim.m_targetSpace == pscene.space); |
95 | Console.WriteLine("TargetSpace: " + oprim.m_targetSpace + " - SceneMainSpace: " + pscene.space); | 99 | m_log.Info("TargetSpace: " + oprim.m_targetSpace + " - SceneMainSpace: " + pscene.space); |
96 | 100 | ||
97 | Assert.That(!oprim.m_taintadd); | 101 | Assert.That(!oprim.m_taintadd); |
98 | Console.WriteLine("Prim Position (" + oprim.m_localID + "): " + prim.Position.ToString()); | 102 | m_log.Info("Prim Position (" + oprim.m_localID + "): " + prim.Position.ToString()); |
99 | 103 | ||
100 | // Make sure we're above the ground | 104 | // Make sure we're above the ground |
101 | //Assert.That(prim.Position.Z > 20f); | 105 | //Assert.That(prim.Position.Z > 20f); |
102 | //Console.WriteLine("PrimCollisionScore (" + oprim.m_localID + "): " + oprim.m_collisionscore); | 106 | //m_log.Info("PrimCollisionScore (" + oprim.m_localID + "): " + oprim.m_collisionscore); |
103 | 107 | ||
104 | // Make sure we've got a Body | 108 | // Make sure we've got a Body |
105 | Assert.That(oprim.Body != (IntPtr)0); | 109 | Assert.That(oprim.Body != (IntPtr)0); |
106 | //Console.WriteLine( | 110 | //m_log.Info( |
107 | } | 111 | } |
108 | 112 | ||
109 | // Make sure we're not somewhere above the ground | 113 | // Make sure we're not somewhere above the ground |
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index f30de4d..359e7b3 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -579,7 +579,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
579 | //if (id == d.GeomClassId.TriMeshClass) | 579 | //if (id == d.GeomClassId.TriMeshClass) |
580 | //{ | 580 | //{ |
581 | // m_log.InfoFormat("near: A collision was detected between {1} and {2}", 0, name1, name2); | 581 | // m_log.InfoFormat("near: A collision was detected between {1} and {2}", 0, name1, name2); |
582 | //System.Console.WriteLine("near: A collision was detected between {1} and {2}", 0, name1, name2); | 582 | //m_log.Debug("near: A collision was detected between {1} and {2}", 0, name1, name2); |
583 | //} | 583 | //} |
584 | 584 | ||
585 | // Figure out how many contact points we have | 585 | // Figure out how many contact points we have |
@@ -945,8 +945,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
945 | // so lets throttle them and send them again after it's somewhat sorted out. | 945 | // so lets throttle them and send them again after it's somewhat sorted out. |
946 | p2.ThrottleUpdates = true; | 946 | p2.ThrottleUpdates = true; |
947 | } | 947 | } |
948 | //System.Console.WriteLine(count.ToString()); | 948 | //m_log.Debug(count.ToString()); |
949 | //System.Console.WriteLine("near: A collision was detected between {1} and {2}", 0, name1, name2); | 949 | //m_log.Debug("near: A collision was detected between {1} and {2}", 0, name1, name2); |
950 | } | 950 | } |
951 | } | 951 | } |
952 | 952 | ||
@@ -2095,7 +2095,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2095 | // convenient place to do it for now... | 2095 | // convenient place to do it for now... |
2096 | 2096 | ||
2097 | // //if (pbs.PathCurve == (byte)Primitive.PathCurve.Circle && pbs.ProfileCurve == (byte)Primitive.ProfileCurve.Circle && pbs.PathScaleY <= 0.75f) | 2097 | // //if (pbs.PathCurve == (byte)Primitive.PathCurve.Circle && pbs.ProfileCurve == (byte)Primitive.ProfileCurve.Circle && pbs.PathScaleY <= 0.75f) |
2098 | // //Console.WriteLine("needsMeshing: " + " pathCurve: " + pbs.PathCurve.ToString() + " profileCurve: " + pbs.ProfileCurve.ToString() + " pathScaleY: " + Primitive.UnpackPathScale(pbs.PathScaleY).ToString()); | 2098 | // //m_log.Debug("needsMeshing: " + " pathCurve: " + pbs.PathCurve.ToString() + " profileCurve: " + pbs.ProfileCurve.ToString() + " pathScaleY: " + Primitive.UnpackPathScale(pbs.PathScaleY).ToString()); |
2099 | int iPropertiesNotSupportedDefault = 0; | 2099 | int iPropertiesNotSupportedDefault = 0; |
2100 | 2100 | ||
2101 | if (pbs.SculptEntry && !meshSculptedPrim) | 2101 | if (pbs.SculptEntry && !meshSculptedPrim) |