diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 7b3d18f..419fb69 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -66,7 +66,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
66 | private IntPtr Amotor = IntPtr.Zero; | 66 | private IntPtr Amotor = IntPtr.Zero; |
67 | 67 | ||
68 | private PhysicsVector m_PIDTarget = new PhysicsVector(0, 0, 0); | 68 | private PhysicsVector m_PIDTarget = new PhysicsVector(0, 0, 0); |
69 | private PhysicsVector m_taintPIDTarget = new PhysicsVector(0, 0, 0); | 69 | // private PhysicsVector m_taintPIDTarget = new PhysicsVector(0, 0, 0); |
70 | private float m_PIDTau = 0f; | 70 | private float m_PIDTau = 0f; |
71 | private float PID_D = 35f; | 71 | private float PID_D = 35f; |
72 | private float PID_G = 25f; | 72 | private float PID_G = 25f; |
@@ -80,7 +80,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
80 | private float m_groundHeight = 0f; | 80 | private float m_groundHeight = 0f; |
81 | private float m_waterHeight = 0f; | 81 | private float m_waterHeight = 0f; |
82 | 82 | ||
83 | private float m_tensor = 5f; | 83 | // private float m_tensor = 5f; |
84 | private int body_autodisable_frames = 20; | 84 | private int body_autodisable_frames = 20; |
85 | private IMesh primMesh = null; | 85 | private IMesh primMesh = null; |
86 | 86 | ||
@@ -189,7 +189,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
189 | PID_D = parent_scene.bodyPIDD; | 189 | PID_D = parent_scene.bodyPIDD; |
190 | PID_G = parent_scene.bodyPIDG; | 190 | PID_G = parent_scene.bodyPIDG; |
191 | m_density = parent_scene.geomDefaultDensity; | 191 | m_density = parent_scene.geomDefaultDensity; |
192 | m_tensor = parent_scene.bodyMotorJointMaxforceTensor; | 192 | // m_tensor = parent_scene.bodyMotorJointMaxforceTensor; |
193 | body_autodisable_frames = parent_scene.bodyFramesAutoDisable; | 193 | body_autodisable_frames = parent_scene.bodyFramesAutoDisable; |
194 | 194 | ||
195 | 195 | ||
@@ -2746,11 +2746,9 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2746 | 2746 | ||
2747 | axisnum = (axisnum - (axis.X + axis.Y + axis.Z)); | 2747 | axisnum = (axisnum - (axis.X + axis.Y + axis.Z)); |
2748 | 2748 | ||
2749 | PhysicsVector totalSize = new PhysicsVector(_size.X, _size.Y, _size.Z); | 2749 | // PhysicsVector totalSize = new PhysicsVector(_size.X, _size.Y, _size.Z); |
2750 | 2750 | ||
2751 | 2751 | ||
2752 | |||
2753 | |||
2754 | // Inverse Inertia Matrix, set the X, Y, and/r Z inertia to 0 then invert it again. | 2752 | // Inverse Inertia Matrix, set the X, Y, and/r Z inertia to 0 then invert it again. |
2755 | d.Mass objMass; | 2753 | d.Mass objMass; |
2756 | d.MassSetZero(out objMass); | 2754 | d.MassSetZero(out objMass); |
@@ -2807,7 +2805,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2807 | 2805 | ||
2808 | if (axisnum <= 0) | 2806 | if (axisnum <= 0) |
2809 | return; | 2807 | return; |
2810 | int dAMotorEuler = 1; | 2808 | // int dAMotorEuler = 1; |
2811 | 2809 | ||
2812 | Amotor = d.JointCreateAMotor(_parent_scene.world, IntPtr.Zero); | 2810 | Amotor = d.JointCreateAMotor(_parent_scene.world, IntPtr.Zero); |
2813 | d.JointAttach(Amotor, Body, IntPtr.Zero); | 2811 | d.JointAttach(Amotor, Body, IntPtr.Zero); |