diff options
author | Robert Adams | 2013-07-09 09:33:46 -0700 |
---|---|---|
committer | Robert Adams | 2013-07-09 09:37:42 -0700 |
commit | 2c761cef192670a6f54fe10bb5b5894b5371ea7c (patch) | |
tree | 223c6582ef8d27db7465d351492399c110318781 /OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | |
parent | remove some cruft and trigger a rebuild (diff) | |
download | opensim-SC-2c761cef192670a6f54fe10bb5b5894b5371ea7c.zip opensim-SC-2c761cef192670a6f54fe10bb5b5894b5371ea7c.tar.gz opensim-SC-2c761cef192670a6f54fe10bb5b5894b5371ea7c.tar.bz2 opensim-SC-2c761cef192670a6f54fe10bb5b5894b5371ea7c.tar.xz |
BulletSim: add parameter to optionally disable vehicle linear deflection.
Add parameter to not apply vehicle linear deflection Z forces if
vehicle is not colliding. This defaults to 'true' so vehicles will fall
even if there is some linear deflection to apply.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSParam.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs index 75c3399..dcf1e83 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | |||
@@ -155,6 +155,8 @@ public static class BSParam | |||
155 | public static Vector3 VehicleInertiaFactor { get; private set; } | 155 | public static Vector3 VehicleInertiaFactor { get; private set; } |
156 | public static float VehicleGroundGravityFudge { get; private set; } | 156 | public static float VehicleGroundGravityFudge { get; private set; } |
157 | public static float VehicleAngularBankingTimescaleFudge { get; private set; } | 157 | public static float VehicleAngularBankingTimescaleFudge { get; private set; } |
158 | public static bool VehicleEnableLinearDeflection { get; private set; } | ||
159 | public static bool VehicleLinearDeflectionNotCollidingNoZ { get; private set; } | ||
158 | public static bool VehicleEnableAngularVerticalAttraction { get; private set; } | 160 | public static bool VehicleEnableAngularVerticalAttraction { get; private set; } |
159 | public static int VehicleAngularVerticalAttractionAlgorithm { get; private set; } | 161 | public static int VehicleAngularVerticalAttractionAlgorithm { get; private set; } |
160 | public static bool VehicleEnableAngularDeflection { get; private set; } | 162 | public static bool VehicleEnableAngularDeflection { get; private set; } |
@@ -609,10 +611,14 @@ public static class BSParam | |||
609 | 0.2f ), | 611 | 0.2f ), |
610 | new ParameterDefn<float>("VehicleAngularBankingTimescaleFudge", "Factor to multiple angular banking timescale. Tune to increase realism.", | 612 | new ParameterDefn<float>("VehicleAngularBankingTimescaleFudge", "Factor to multiple angular banking timescale. Tune to increase realism.", |
611 | 60.0f ), | 613 | 60.0f ), |
614 | new ParameterDefn<bool>("VehicleEnableLinearDeflection", "Turn on/off vehicle linear deflection effect", | ||
615 | true ), | ||
616 | new ParameterDefn<bool>("VehicleLinearDeflectionNotCollidingNoZ", "Turn on/off linear deflection Z effect on non-colliding vehicles", | ||
617 | true ), | ||
612 | new ParameterDefn<bool>("VehicleEnableAngularVerticalAttraction", "Turn on/off vehicle angular vertical attraction effect", | 618 | new ParameterDefn<bool>("VehicleEnableAngularVerticalAttraction", "Turn on/off vehicle angular vertical attraction effect", |
613 | true ), | 619 | true ), |
614 | new ParameterDefn<int>("VehicleAngularVerticalAttractionAlgorithm", "Select vertical attraction algo. You need to look at the source.", | 620 | new ParameterDefn<int>("VehicleAngularVerticalAttractionAlgorithm", "Select vertical attraction algo. You need to look at the source.", |
615 | 1 ), | 621 | 0 ), |
616 | new ParameterDefn<bool>("VehicleEnableAngularDeflection", "Turn on/off vehicle angular deflection effect", | 622 | new ParameterDefn<bool>("VehicleEnableAngularDeflection", "Turn on/off vehicle angular deflection effect", |
617 | true ), | 623 | true ), |
618 | new ParameterDefn<bool>("VehicleEnableAngularBanking", "Turn on/off vehicle angular banking effect", | 624 | new ParameterDefn<bool>("VehicleEnableAngularBanking", "Turn on/off vehicle angular banking effect", |