aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorRobert Adams2014-05-17 20:11:22 -0700
committerRobert Adams2014-05-17 20:11:22 -0700
commit0be9e3b079088829eec49d856980f14a6372fda4 (patch)
tree0f92c7c0e8b226dc4423bb6c79fb68cada0334b0 /OpenSim
parentminor: eliminate now unnecessary string.Format in postgresql RetrieveGroups m... (diff)
downloadopensim-SC_OLD-0be9e3b079088829eec49d856980f14a6372fda4.zip
opensim-SC_OLD-0be9e3b079088829eec49d856980f14a6372fda4.tar.gz
opensim-SC_OLD-0be9e3b079088829eec49d856980f14a6372fda4.tar.bz2
opensim-SC_OLD-0be9e3b079088829eec49d856980f14a6372fda4.tar.xz
BulletSim: adjust avatar step up parameters to better walk up small
staircases. This change is required because of the change in the avatar default shape from the capsule to the rectangle.
Diffstat (limited to 'OpenSim')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs4
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSParam.cs4
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
index 1bcf879..1b8a454 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
@@ -399,8 +399,8 @@ public class BSActorAvatarMove : BSActor
399 m_controllingPrim.ForcePosition = m_controllingPrim.RawPosition + displacement; 399 m_controllingPrim.ForcePosition = m_controllingPrim.RawPosition + displacement;
400 } 400 }
401 } 401 }
402 m_physicsScene.DetailLog("{0},BSCharacter.WalkUpStairs.ComputeStairCorrection,disp={1},force={2}", 402 m_physicsScene.DetailLog("{0},BSCharacter.WalkUpStairs.ComputeStairCorrection,stepUp={1},isp={2},force={3}",
403 m_controllingPrim.LocalID, displacement, ret); 403 m_controllingPrim.LocalID, stepUp, displacement, ret);
404 404
405 } 405 }
406 return ret; 406 return ret;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 6683446..de42a4c 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -598,9 +598,9 @@ public static class BSParam
598 new ParameterDefn<float>("AvatarStepForceFactor", "Controls the amount of force up applied to step up onto a step", 598 new ParameterDefn<float>("AvatarStepForceFactor", "Controls the amount of force up applied to step up onto a step",
599 1.0f ), 599 1.0f ),
600 new ParameterDefn<float>("AvatarStepUpCorrectionFactor", "Multiplied by height of step collision to create up movement at step", 600 new ParameterDefn<float>("AvatarStepUpCorrectionFactor", "Multiplied by height of step collision to create up movement at step",
601 1.0f ), 601 2.0f ),
602 new ParameterDefn<int>("AvatarStepSmoothingSteps", "Number of frames after a step collision that we continue walking up stairs", 602 new ParameterDefn<int>("AvatarStepSmoothingSteps", "Number of frames after a step collision that we continue walking up stairs",
603 2 ), 603 1 ),
604 604
605 new ParameterDefn<float>("VehicleMaxLinearVelocity", "Maximum velocity magnitude that can be assigned to a vehicle", 605 new ParameterDefn<float>("VehicleMaxLinearVelocity", "Maximum velocity magnitude that can be assigned to a vehicle",
606 1000.0f, 606 1000.0f,