diff options
author | Robert Adams | 2015-01-07 06:39:29 -0800 |
---|---|---|
committer | Robert Adams | 2015-01-07 06:39:29 -0800 |
commit | 700543b161f653ea41faf3d125a1eb9be389ec23 (patch) | |
tree | 719c9f864ecbeb5ee5f1cbaece208d440946a6f7 /OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | |
parent | Donation of robust network connectors for estate service, as promised. This a... (diff) | |
download | opensim-SC_OLD-700543b161f653ea41faf3d125a1eb9be389ec23.zip opensim-SC_OLD-700543b161f653ea41faf3d125a1eb9be389ec23.tar.gz opensim-SC_OLD-700543b161f653ea41faf3d125a1eb9be389ec23.tar.bz2 opensim-SC_OLD-700543b161f653ea41faf3d125a1eb9be389ec23.tar.xz |
BulletSim: tweek step parameters and logic to make walking up steps
closer to SL. This change should address small floor edges acting like
walls, approaching a step at any angle (other than walking backwards)
will allow walking up, and reducing the avatar pop-up when going up
stairs.
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs index e7f4def..ef75e3f 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | |||
@@ -153,6 +153,8 @@ public static class BSParam | |||
153 | public static int AvatarJumpFrames { get; private set; } | 153 | public static int AvatarJumpFrames { get; private set; } |
154 | public static float AvatarBelowGroundUpCorrectionMeters { get; private set; } | 154 | public static float AvatarBelowGroundUpCorrectionMeters { get; private set; } |
155 | public static float AvatarStepHeight { get; private set; } | 155 | public static float AvatarStepHeight { get; private set; } |
156 | public static float AvatarStepAngle { get; private set; } | ||
157 | public static float AvatarStepGroundFudge { get; private set; } | ||
156 | public static float AvatarStepApproachFactor { get; private set; } | 158 | public static float AvatarStepApproachFactor { get; private set; } |
157 | public static float AvatarStepForceFactor { get; private set; } | 159 | public static float AvatarStepForceFactor { get; private set; } |
158 | public static float AvatarStepUpCorrectionFactor { get; private set; } | 160 | public static float AvatarStepUpCorrectionFactor { get; private set; } |
@@ -614,13 +616,17 @@ public static class BSParam | |||
614 | new ParameterDefn<int>("AvatarJumpFrames", "Number of frames to allow jump forces. Changes jump height.", | 616 | new ParameterDefn<int>("AvatarJumpFrames", "Number of frames to allow jump forces. Changes jump height.", |
615 | 4 ), | 617 | 4 ), |
616 | new ParameterDefn<float>("AvatarStepHeight", "Height of a step obstacle to consider step correction", | 618 | new ParameterDefn<float>("AvatarStepHeight", "Height of a step obstacle to consider step correction", |
617 | 0.6f ) , | 619 | 0.999f ) , |
620 | new ParameterDefn<float>("AvatarStepAngle", "The angle (in radians) for a vertical surface to be considered a step", | ||
621 | 0.3f ) , | ||
622 | new ParameterDefn<float>("AvatarStepGroundFudge", "Fudge factor subtracted from avatar base when comparing collision height", | ||
623 | 0.1f ) , | ||
618 | new ParameterDefn<float>("AvatarStepApproachFactor", "Factor to control angle of approach to step (0=straight on)", | 624 | new ParameterDefn<float>("AvatarStepApproachFactor", "Factor to control angle of approach to step (0=straight on)", |
619 | 0.6f ), | 625 | 2f ), |
620 | new ParameterDefn<float>("AvatarStepForceFactor", "Controls the amount of force up applied to step up onto a step", | 626 | new ParameterDefn<float>("AvatarStepForceFactor", "Controls the amount of force up applied to step up onto a step", |
621 | 1.0f ), | 627 | 0f ), |
622 | new ParameterDefn<float>("AvatarStepUpCorrectionFactor", "Multiplied by height of step collision to create up movement at step", | 628 | new ParameterDefn<float>("AvatarStepUpCorrectionFactor", "Multiplied by height of step collision to create up movement at step", |
623 | 2.0f ), | 629 | 0.8f ), |
624 | new ParameterDefn<int>("AvatarStepSmoothingSteps", "Number of frames after a step collision that we continue walking up stairs", | 630 | new ParameterDefn<int>("AvatarStepSmoothingSteps", "Number of frames after a step collision that we continue walking up stairs", |
625 | 1 ), | 631 | 1 ), |
626 | 632 | ||