aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorKittoFlora2009-11-19 20:13:26 +0100
committerKittoFlora2009-11-19 20:13:26 +0100
commit7f0f5060ec418533ee7d952bdc0815f3925bda9f (patch)
treeb4677999f594d2568fd5ac5f0da6f95a56239a03 /OpenSim
parentFix merge conflicts (diff)
downloadopensim-SC-7f0f5060ec418533ee7d952bdc0815f3925bda9f.zip
opensim-SC-7f0f5060ec418533ee7d952bdc0815f3925bda9f.tar.gz
opensim-SC-7f0f5060ec418533ee7d952bdc0815f3925bda9f.tar.bz2
opensim-SC-7f0f5060ec418533ee7d952bdc0815f3925bda9f.tar.xz
Clean up messages in ODE
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs2
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs6
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs b/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs
index 1842eb4..78b15be 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs
@@ -629,7 +629,7 @@ namespace OpenSim.Region.Physics.OdePlugin
629 // Error is 0 (no error) to +/- 2 (max error) 629 // Error is 0 (no error) to +/- 2 (max error)
630 // scale it by VAservo 630 // scale it by VAservo
631 verterr = verterr * VAservo; 631 verterr = verterr * VAservo;
632if(frcount == 0) Console.WriteLine("VAerr=" + verterr); 632//if(frcount == 0) Console.WriteLine("VAerr=" + verterr);
633 633
634 // As the body rotates around the X axis, then verterr.Y increases; Rotated around Y then .X increases, so 634 // As the body rotates around the X axis, then verterr.Y increases; Rotated around Y then .X increases, so
635 // Change Body angular velocity X based on Y, and Y based on X. Z is not changed. 635 // Change Body angular velocity X based on Y, and Y based on X. Z is not changed.
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 8f2c801..2bf96e4 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -1584,8 +1584,8 @@ Console.WriteLine(" JointCreateFixed");
1584 1584
1585 if (IsPhysical && (Body != IntPtr.Zero) && !m_isSelected && !childPrim) // KF: Only move root prims. 1585 if (IsPhysical && (Body != IntPtr.Zero) && !m_isSelected && !childPrim) // KF: Only move root prims.
1586 { 1586 {
1587if(frcount == 0) Console.WriteLine("Move " + m_primName + " VTyp " + m_vehicle.Type + 1587//if(frcount == 0) Console.WriteLine("Move " + m_primName + " VTyp " + m_vehicle.Type +
1588 " usePID=" + m_usePID + " seHover=" + m_useHoverPID + " useAPID=" + m_useAPID); 1588 // " usePID=" + m_usePID + " seHover=" + m_useHoverPID + " useAPID=" + m_useAPID);
1589 if (m_vehicle.Type != Vehicle.TYPE_NONE) 1589 if (m_vehicle.Type != Vehicle.TYPE_NONE)
1590 { 1590 {
1591 // 'VEHICLES' are dealt with in ODEDynamics.cs 1591 // 'VEHICLES' are dealt with in ODEDynamics.cs
@@ -1806,7 +1806,7 @@ if(frcount == 0) Console.WriteLine("Move " + m_primName + " VTyp " + m_vehicle
1806 d.BodySetAngularVel (Body, rotforce.X, rotforce.Y, rotforce.Z); 1806 d.BodySetAngularVel (Body, rotforce.X, rotforce.Y, rotforce.Z);
1807//Console.WriteLine("axis= " + diff_axis + " angle= " + diff_angle + "servo= " + RLAservo); 1807//Console.WriteLine("axis= " + diff_axis + " angle= " + diff_angle + "servo= " + RLAservo);
1808 } 1808 }
1809if(frcount == 0) Console.WriteLine("mass= " + m_mass + " servo= " + RLAservo + " angle= " + diff_angle); 1809//if(frcount == 0) Console.WriteLine("mass= " + m_mass + " servo= " + RLAservo + " angle= " + diff_angle);
1810 } // end m_useAPID 1810 } // end m_useAPID
1811 1811
1812 fx *= m_mass; 1812 fx *= m_mass;