diff options
author | Robert Adams | 2014-04-28 11:08:47 -0700 |
---|---|---|
committer | Robert Adams | 2014-04-28 11:08:47 -0700 |
commit | 63aea3a5f281ac396787beab5615214b36e2332e (patch) | |
tree | 5fca14829eb458bb7d2cf199ac1215ef21f4629f /OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | |
parent | Removed dependency on Linq in OpenProfileClient (diff) | |
download | opensim-SC-63aea3a5f281ac396787beab5615214b36e2332e.zip opensim-SC-63aea3a5f281ac396787beab5615214b36e2332e.tar.gz opensim-SC-63aea3a5f281ac396787beab5615214b36e2332e.tar.bz2 opensim-SC-63aea3a5f281ac396787beab5615214b36e2332e.tar.xz |
BUlletSim: move safeynet ground plane to lower altitude. Define new BulletSim
parameter 'TerrainGroundPlane' which defaults to -500.
BulletSim had assumed altitudes never went negative but that is not true. The
ground plane is just a safety net so things wouldn't fall to infinity.
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs index f2ad528..6683446 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | |||
@@ -97,6 +97,7 @@ public static class BSParam | |||
97 | 97 | ||
98 | public static float TerrainImplementation { get; set; } | 98 | public static float TerrainImplementation { get; set; } |
99 | public static int TerrainMeshMagnification { get; private set; } | 99 | public static int TerrainMeshMagnification { get; private set; } |
100 | public static float TerrainGroundPlane { get; private set; } | ||
100 | public static float TerrainFriction { get; private set; } | 101 | public static float TerrainFriction { get; private set; } |
101 | public static float TerrainHitFraction { get; private set; } | 102 | public static float TerrainHitFraction { get; private set; } |
102 | public static float TerrainRestitution { get; private set; } | 103 | public static float TerrainRestitution { get; private set; } |
@@ -544,6 +545,8 @@ public static class BSParam | |||
544 | (float)BSTerrainPhys.TerrainImplementation.Heightmap ), | 545 | (float)BSTerrainPhys.TerrainImplementation.Heightmap ), |
545 | new ParameterDefn<int>("TerrainMeshMagnification", "Number of times the 256x256 heightmap is multiplied to create the terrain mesh" , | 546 | new ParameterDefn<int>("TerrainMeshMagnification", "Number of times the 256x256 heightmap is multiplied to create the terrain mesh" , |
546 | 2 ), | 547 | 2 ), |
548 | new ParameterDefn<float>("TerrainGroundPlane", "Altitude of ground plane used to keep things from falling to infinity" , | ||
549 | -500.0f ), | ||
547 | new ParameterDefn<float>("TerrainFriction", "Factor to reduce movement against terrain surface" , | 550 | new ParameterDefn<float>("TerrainFriction", "Factor to reduce movement against terrain surface" , |
548 | 0.3f ), | 551 | 0.3f ), |
549 | new ParameterDefn<float>("TerrainHitFraction", "Distance to measure hit collisions" , | 552 | new ParameterDefn<float>("TerrainHitFraction", "Distance to measure hit collisions" , |