aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
diff options
context:
space:
mode:
authorRobert Adams2014-06-18 22:39:28 -0700
committerRobert Adams2014-06-18 22:39:28 -0700
commitf348928590de1b7044801f72d3c415cb10175d45 (patch)
treec9ba5d05adeb7f45d048b49e1546ef0e36edf834 /OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
parentrefactor: Simplify compilation result tests by factoring out common code. (diff)
downloadopensim-SC-f348928590de1b7044801f72d3c415cb10175d45.zip
opensim-SC-f348928590de1b7044801f72d3c415cb10175d45.tar.gz
opensim-SC-f348928590de1b7044801f72d3c415cb10175d45.tar.bz2
opensim-SC-f348928590de1b7044801f72d3c415cb10175d45.tar.xz
BulletSim: more tweeks to AliciaRaven's flying mods. Added parameters
AvatarFlyingGroundMargin and AvatarFlyingGroundUpForce set to 5.0 and 2.0 respectively which seems to give about the same action as in SL. Also moved force addition to before the velocity to force computation so the upward velocity is properly applied to the avatar mass.
Diffstat (limited to '')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSParam.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index de42a4c..042e8a4 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -136,6 +136,8 @@ public static class BSParam
136 public static float AvatarHeightLowFudge { get; private set; } 136 public static float AvatarHeightLowFudge { get; private set; }
137 public static float AvatarHeightMidFudge { get; private set; } 137 public static float AvatarHeightMidFudge { get; private set; }
138 public static float AvatarHeightHighFudge { get; private set; } 138 public static float AvatarHeightHighFudge { get; private set; }
139 public static float AvatarFlyingGroundMargin { get; private set; }
140 public static float AvatarFlyingGroundUpForce { get; private set; }
139 public static float AvatarContactProcessingThreshold { get; private set; } 141 public static float AvatarContactProcessingThreshold { get; private set; }
140 public static float AvatarStopZeroThreshold { get; private set; } 142 public static float AvatarStopZeroThreshold { get; private set; }
141 public static int AvatarJumpFrames { get; private set; } 143 public static int AvatarJumpFrames { get; private set; }
@@ -583,6 +585,10 @@ public static class BSParam
583 0f ), 585 0f ),
584 new ParameterDefn<float>("AvatarHeightHighFudge", "A fudge factor to make tall avatars stand on the ground", 586 new ParameterDefn<float>("AvatarHeightHighFudge", "A fudge factor to make tall avatars stand on the ground",
585 0f ), 587 0f ),
588 new ParameterDefn<float>("AvatarFlyingGroundMargin", "Meters avatar is kept above the ground when flying",
589 5f ),
590 new ParameterDefn<float>("AvatarFlyingGroundUpForce", "Upward force applied to the avatar to keep it at flying ground margin",
591 2.0f ),
586 new ParameterDefn<float>("AvatarContactProcessingThreshold", "Distance from capsule to check for collisions", 592 new ParameterDefn<float>("AvatarContactProcessingThreshold", "Distance from capsule to check for collisions",
587 0.1f ), 593 0.1f ),
588 new ParameterDefn<float>("AvatarStopZeroThreshold", "Movement velocity below which avatar is assumed to be stopped", 594 new ParameterDefn<float>("AvatarStopZeroThreshold", "Movement velocity below which avatar is assumed to be stopped",