aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorKittoFlora2009-10-22 21:14:00 +0200
committerKittoFlora2009-10-22 21:14:00 +0200
commit91084653bdef88eaa53c072038d15147e5510376 (patch)
tree63eaae7d1502161b5d8590be3381dbe58208ad81 /OpenSim/Region/Physics
parentMerge branch 'master' into vehicles (diff)
downloadopensim-SC-91084653bdef88eaa53c072038d15147e5510376.zip
opensim-SC-91084653bdef88eaa53c072038d15147e5510376.tar.gz
opensim-SC-91084653bdef88eaa53c072038d15147e5510376.tar.bz2
opensim-SC-91084653bdef88eaa53c072038d15147e5510376.tar.xz
Commented out instrumentation in ODEPrim.cs
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 864ea80..f59f0ae 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -1564,6 +1564,8 @@ Console.WriteLine(" JointCreateFixed");
1564 } 1564 }
1565 else 1565 else
1566 { 1566 {
1567//Console.WriteLine("Move " + m_primName);
1568 if(!d.BodyIsEnabled (Body)) d.BodyEnable (Body); // KF add 161009
1567 // NON-'VEHICLES' are dealt with here 1569 // NON-'VEHICLES' are dealt with here
1568 if (d.BodyIsEnabled(Body) && !m_angularlock.IsIdentical(PhysicsVector.Zero, 0.003f)) 1570 if (d.BodyIsEnabled(Body) && !m_angularlock.IsIdentical(PhysicsVector.Zero, 0.003f))
1569 { 1571 {
@@ -1592,6 +1594,7 @@ Console.WriteLine(" JointCreateFixed");
1592 1594
1593 if (m_usePID) 1595 if (m_usePID)
1594 { 1596 {
1597//Console.WriteLine("PID " + m_primName);
1595 // KF - this is for object move? eg. llSetPos() ? 1598 // KF - this is for object move? eg. llSetPos() ?
1596 //if (!d.BodyIsEnabled(Body)) 1599 //if (!d.BodyIsEnabled(Body))
1597 //d.BodySetForce(Body, 0f, 0f, 0f); 1600 //d.BodySetForce(Body, 0f, 0f, 0f);
@@ -1663,6 +1666,8 @@ Console.WriteLine(" JointCreateFixed");
1663 // Hover PID Controller needs to be mutually exlusive to MoveTo PID controller 1666 // Hover PID Controller needs to be mutually exlusive to MoveTo PID controller
1664 if (m_useHoverPID && !m_usePID) 1667 if (m_useHoverPID && !m_usePID)
1665 { 1668 {
1669//Console.WriteLine("Hover " + m_primName);
1670
1666 // If we're using the PID controller, then we have no gravity 1671 // If we're using the PID controller, then we have no gravity
1667 fz = (-1 * _parent_scene.gravityz) * m_mass; 1672 fz = (-1 * _parent_scene.gravityz) * m_mass;
1668 1673
@@ -1779,6 +1784,7 @@ Console.WriteLine(" JointCreateFixed");
1779 if (fy < nmin) 1784 if (fy < nmin)
1780 fy = nmin; 1785 fy = nmin;
1781 d.BodyAddForce(Body, fx, fy, fz); 1786 d.BodyAddForce(Body, fx, fy, fz);
1787//Console.WriteLine("AddForce " + fx + "," + fy + "," + fz);
1782 } 1788 }
1783 } 1789 }
1784 } 1790 }
@@ -1786,6 +1792,8 @@ Console.WriteLine(" JointCreateFixed");
1786 { // is not physical, or is not a body or is selected 1792 { // is not physical, or is not a body or is selected
1787 // _zeroPosition = d.BodyGetPosition(Body); 1793 // _zeroPosition = d.BodyGetPosition(Body);
1788 return; 1794 return;
1795//Console.WriteLine("Nothing " + m_primName);
1796
1789 } 1797 }
1790 } 1798 }
1791 1799