diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs b/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs index 345112d..1842eb4 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs | |||
@@ -130,7 +130,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
130 | 130 | ||
131 | //Hover and Buoyancy properties | 131 | //Hover and Buoyancy properties |
132 | private float m_VhoverHeight = 0f; | 132 | private float m_VhoverHeight = 0f; |
133 | private float m_VhoverEfficiency = 0f; | 133 | // private float m_VhoverEfficiency = 0f; |
134 | private float m_VhoverTimescale = 0f; | 134 | private float m_VhoverTimescale = 0f; |
135 | private float m_VhoverTargetHeight = -1.0f; // if <0 then no hover, else its the current target height | 135 | private float m_VhoverTargetHeight = -1.0f; // if <0 then no hover, else its the current target height |
136 | private float m_VehicleBuoyancy = 0f; // Set by VEHICLE_BUOYANCY, for a vehicle. | 136 | private float m_VehicleBuoyancy = 0f; // Set by VEHICLE_BUOYANCY, for a vehicle. |
@@ -183,11 +183,11 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
183 | if (pValue > 1f) pValue = 1f; | 183 | if (pValue > 1f) pValue = 1f; |
184 | m_VehicleBuoyancy = pValue; | 184 | m_VehicleBuoyancy = pValue; |
185 | break; | 185 | break; |
186 | case Vehicle.HOVER_EFFICIENCY: | 186 | // case Vehicle.HOVER_EFFICIENCY: |
187 | if (pValue < 0f) pValue = 0f; | 187 | // if (pValue < 0f) pValue = 0f; |
188 | if (pValue > 1f) pValue = 1f; | 188 | // if (pValue > 1f) pValue = 1f; |
189 | m_VhoverEfficiency = pValue; | 189 | // m_VhoverEfficiency = pValue; |
190 | break; | 190 | // break; |
191 | case Vehicle.HOVER_HEIGHT: | 191 | case Vehicle.HOVER_HEIGHT: |
192 | m_VhoverHeight = pValue; | 192 | m_VhoverHeight = pValue; |
193 | break; | 193 | break; |
@@ -304,7 +304,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
304 | m_angularMotorTimescale = 1000; | 304 | m_angularMotorTimescale = 1000; |
305 | m_angularMotorDecayTimescale = 120; | 305 | m_angularMotorDecayTimescale = 120; |
306 | m_VhoverHeight = 0; | 306 | m_VhoverHeight = 0; |
307 | m_VhoverEfficiency = 1; | 307 | // m_VhoverEfficiency = 1; |
308 | m_VhoverTimescale = 10; | 308 | m_VhoverTimescale = 10; |
309 | m_VehicleBuoyancy = 0; | 309 | m_VehicleBuoyancy = 0; |
310 | // m_linearDeflectionEfficiency = 1; | 310 | // m_linearDeflectionEfficiency = 1; |
@@ -330,7 +330,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
330 | m_angularMotorTimescale = 1; | 330 | m_angularMotorTimescale = 1; |
331 | m_angularMotorDecayTimescale = 0.8f; | 331 | m_angularMotorDecayTimescale = 0.8f; |
332 | m_VhoverHeight = 0; | 332 | m_VhoverHeight = 0; |
333 | m_VhoverEfficiency = 0; | 333 | // m_VhoverEfficiency = 0; |
334 | m_VhoverTimescale = 1000; | 334 | m_VhoverTimescale = 1000; |
335 | m_VehicleBuoyancy = 0; | 335 | m_VehicleBuoyancy = 0; |
336 | // // m_linearDeflectionEfficiency = 1; | 336 | // // m_linearDeflectionEfficiency = 1; |
@@ -357,7 +357,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
357 | m_angularMotorTimescale = 4; | 357 | m_angularMotorTimescale = 4; |
358 | m_angularMotorDecayTimescale = 4; | 358 | m_angularMotorDecayTimescale = 4; |
359 | m_VhoverHeight = 0; | 359 | m_VhoverHeight = 0; |
360 | m_VhoverEfficiency = 0.5f; | 360 | // m_VhoverEfficiency = 0.5f; |
361 | m_VhoverTimescale = 2; | 361 | m_VhoverTimescale = 2; |
362 | m_VehicleBuoyancy = 1; | 362 | m_VehicleBuoyancy = 1; |
363 | // m_linearDeflectionEfficiency = 0.5f; | 363 | // m_linearDeflectionEfficiency = 0.5f; |
@@ -385,7 +385,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
385 | m_angularMotorTimescale = 4; | 385 | m_angularMotorTimescale = 4; |
386 | m_angularMotorDecayTimescale = 4; | 386 | m_angularMotorDecayTimescale = 4; |
387 | m_VhoverHeight = 0; | 387 | m_VhoverHeight = 0; |
388 | m_VhoverEfficiency = 0.5f; | 388 | // m_VhoverEfficiency = 0.5f; |
389 | m_VhoverTimescale = 1000; | 389 | m_VhoverTimescale = 1000; |
390 | m_VehicleBuoyancy = 0; | 390 | m_VehicleBuoyancy = 0; |
391 | // m_linearDeflectionEfficiency = 0.5f; | 391 | // m_linearDeflectionEfficiency = 0.5f; |
@@ -412,7 +412,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
412 | m_angularMotorTimescale = 6; | 412 | m_angularMotorTimescale = 6; |
413 | m_angularMotorDecayTimescale = 10; | 413 | m_angularMotorDecayTimescale = 10; |
414 | m_VhoverHeight = 5; | 414 | m_VhoverHeight = 5; |
415 | m_VhoverEfficiency = 0.8f; | 415 | // m_VhoverEfficiency = 0.8f; |
416 | m_VhoverTimescale = 10; | 416 | m_VhoverTimescale = 10; |
417 | m_VehicleBuoyancy = 1; | 417 | m_VehicleBuoyancy = 1; |
418 | // m_linearDeflectionEfficiency = 0; | 418 | // m_linearDeflectionEfficiency = 0; |