aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs26
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs b/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs
index 4a802cd..39cdc0f 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs
@@ -67,8 +67,8 @@ namespace OpenSim.Region.Physics.OdePlugin
67 67
68 // private OdeScene m_parentScene = null; 68 // private OdeScene m_parentScene = null;
69 private IntPtr m_body = IntPtr.Zero; 69 private IntPtr m_body = IntPtr.Zero;
70 private IntPtr m_jointGroup = IntPtr.Zero; 70// private IntPtr m_jointGroup = IntPtr.Zero;
71 private IntPtr m_aMotor = IntPtr.Zero; 71// private IntPtr m_aMotor = IntPtr.Zero;
72 72
73 73
74 // Vehicle properties 74 // Vehicle properties
@@ -117,7 +117,7 @@ namespace OpenSim.Region.Physics.OdePlugin
117 117
118 //Hover and Buoyancy properties 118 //Hover and Buoyancy properties
119 private float m_VhoverHeight = 0f; 119 private float m_VhoverHeight = 0f;
120 private float m_VhoverEfficiency = 0f; 120// private float m_VhoverEfficiency = 0f;
121 private float m_VhoverTimescale = 0f; 121 private float m_VhoverTimescale = 0f;
122 private float m_VhoverTargetHeight = -1.0f; // if <0 then no hover, else its the current target height 122 private float m_VhoverTargetHeight = -1.0f; // if <0 then no hover, else its the current target height
123 private float m_VehicleBuoyancy = 0f; //KF: m_VehicleBuoyancy is set by VEHICLE_BUOYANCY for a vehicle. 123 private float m_VehicleBuoyancy = 0f; //KF: m_VehicleBuoyancy is set by VEHICLE_BUOYANCY for a vehicle.
@@ -170,11 +170,11 @@ namespace OpenSim.Region.Physics.OdePlugin
170 if (pValue > 1f) pValue = 1f; 170 if (pValue > 1f) pValue = 1f;
171 m_VehicleBuoyancy = pValue; 171 m_VehicleBuoyancy = pValue;
172 break; 172 break;
173 case Vehicle.HOVER_EFFICIENCY: 173// case Vehicle.HOVER_EFFICIENCY:
174 if (pValue < 0f) pValue = 0f; 174// if (pValue < 0f) pValue = 0f;
175 if (pValue > 1f) pValue = 1f; 175// if (pValue > 1f) pValue = 1f;
176 m_VhoverEfficiency = pValue; 176// m_VhoverEfficiency = pValue;
177 break; 177// break;
178 case Vehicle.HOVER_HEIGHT: 178 case Vehicle.HOVER_HEIGHT:
179 m_VhoverHeight = pValue; 179 m_VhoverHeight = pValue;
180 break; 180 break;
@@ -291,7 +291,7 @@ namespace OpenSim.Region.Physics.OdePlugin
291 m_angularMotorTimescale = 1000; 291 m_angularMotorTimescale = 1000;
292 m_angularMotorDecayTimescale = 120; 292 m_angularMotorDecayTimescale = 120;
293 m_VhoverHeight = 0; 293 m_VhoverHeight = 0;
294 m_VhoverEfficiency = 1; 294// m_VhoverEfficiency = 1;
295 m_VhoverTimescale = 10; 295 m_VhoverTimescale = 10;
296 m_VehicleBuoyancy = 0; 296 m_VehicleBuoyancy = 0;
297 // m_linearDeflectionEfficiency = 1; 297 // m_linearDeflectionEfficiency = 1;
@@ -317,7 +317,7 @@ namespace OpenSim.Region.Physics.OdePlugin
317 m_angularMotorTimescale = 1; 317 m_angularMotorTimescale = 1;
318 m_angularMotorDecayTimescale = 0.8f; 318 m_angularMotorDecayTimescale = 0.8f;
319 m_VhoverHeight = 0; 319 m_VhoverHeight = 0;
320 m_VhoverEfficiency = 0; 320// m_VhoverEfficiency = 0;
321 m_VhoverTimescale = 1000; 321 m_VhoverTimescale = 1000;
322 m_VehicleBuoyancy = 0; 322 m_VehicleBuoyancy = 0;
323 // // m_linearDeflectionEfficiency = 1; 323 // // m_linearDeflectionEfficiency = 1;
@@ -344,7 +344,7 @@ namespace OpenSim.Region.Physics.OdePlugin
344 m_angularMotorTimescale = 4; 344 m_angularMotorTimescale = 4;
345 m_angularMotorDecayTimescale = 4; 345 m_angularMotorDecayTimescale = 4;
346 m_VhoverHeight = 0; 346 m_VhoverHeight = 0;
347 m_VhoverEfficiency = 0.5f; 347// m_VhoverEfficiency = 0.5f;
348 m_VhoverTimescale = 2; 348 m_VhoverTimescale = 2;
349 m_VehicleBuoyancy = 1; 349 m_VehicleBuoyancy = 1;
350 // m_linearDeflectionEfficiency = 0.5f; 350 // m_linearDeflectionEfficiency = 0.5f;
@@ -372,7 +372,7 @@ namespace OpenSim.Region.Physics.OdePlugin
372 m_angularMotorTimescale = 4; 372 m_angularMotorTimescale = 4;
373 m_angularMotorDecayTimescale = 4; 373 m_angularMotorDecayTimescale = 4;
374 m_VhoverHeight = 0; 374 m_VhoverHeight = 0;
375 m_VhoverEfficiency = 0.5f; 375// m_VhoverEfficiency = 0.5f;
376 m_VhoverTimescale = 1000; 376 m_VhoverTimescale = 1000;
377 m_VehicleBuoyancy = 0; 377 m_VehicleBuoyancy = 0;
378 // m_linearDeflectionEfficiency = 0.5f; 378 // m_linearDeflectionEfficiency = 0.5f;
@@ -399,7 +399,7 @@ namespace OpenSim.Region.Physics.OdePlugin
399 m_angularMotorTimescale = 6; 399 m_angularMotorTimescale = 6;
400 m_angularMotorDecayTimescale = 10; 400 m_angularMotorDecayTimescale = 10;
401 m_VhoverHeight = 5; 401 m_VhoverHeight = 5;
402 m_VhoverEfficiency = 0.8f; 402// m_VhoverEfficiency = 0.8f;
403 m_VhoverTimescale = 10; 403 m_VhoverTimescale = 10;
404 m_VehicleBuoyancy = 1; 404 m_VehicleBuoyancy = 1;
405 // m_linearDeflectionEfficiency = 0; 405 // m_linearDeflectionEfficiency = 0;