aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorRobert Adams2013-01-28 17:21:13 -0800
committerRobert Adams2013-01-28 17:21:13 -0800
commit47f09ed4c1d6a5d9763b6d1f5f86169e452281c8 (patch)
tree9ac97612e6254da40db275dce57b4f04e19b4275 /OpenSim
parentBulletSim: first unit test: vehicle angular attraction (diff)
downloadopensim-SC_OLD-47f09ed4c1d6a5d9763b6d1f5f86169e452281c8.zip
opensim-SC_OLD-47f09ed4c1d6a5d9763b6d1f5f86169e452281c8.tar.gz
opensim-SC_OLD-47f09ed4c1d6a5d9763b6d1f5f86169e452281c8.tar.bz2
opensim-SC_OLD-47f09ed4c1d6a5d9763b6d1f5f86169e452281c8.tar.xz
BulletSim: enable angular vertical attraction.
Increase terrain collision margin to help vehicles from tunneling into same.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs4
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSParam.cs2
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 05a0dcc..05ab180 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -141,12 +141,12 @@ namespace OpenSim.Region.Physics.BulletSPlugin
141 // in changes by making enablement of debugging flags from INI file. 141 // in changes by making enablement of debugging flags from INI file.
142 public void SetupVehicleDebugging() 142 public void SetupVehicleDebugging()
143 { 143 {
144 enableAngularVerticalAttraction = false; 144 enableAngularVerticalAttraction = true;
145 enableAngularDeflection = false; 145 enableAngularDeflection = false;
146 enableAngularBanking = false; 146 enableAngularBanking = false;
147 if (BSParam.VehicleDebuggingEnabled != ConfigurationParameters.numericFalse) 147 if (BSParam.VehicleDebuggingEnabled != ConfigurationParameters.numericFalse)
148 { 148 {
149 enableAngularVerticalAttraction = false; 149 enableAngularVerticalAttraction = true;
150 enableAngularDeflection = false; 150 enableAngularDeflection = false;
151 enableAngularBanking = false; 151 enableAngularBanking = false;
152 } 152 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 4ece944..8c098b2 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -383,7 +383,7 @@ public static class BSParam
383 (s) => { return TerrainRestitution; }, 383 (s) => { return TerrainRestitution; },
384 (s,p,l,v) => { TerrainRestitution = v; /* TODO: set on real terrain */ } ), 384 (s,p,l,v) => { TerrainRestitution = v; /* TODO: set on real terrain */ } ),
385 new ParameterDefn("TerrainCollisionMargin", "Margin where collision checking starts" , 385 new ParameterDefn("TerrainCollisionMargin", "Margin where collision checking starts" ,
386 0.04f, 386 0.08f,
387 (s,cf,p,v) => { TerrainCollisionMargin = cf.GetFloat(p, v); }, 387 (s,cf,p,v) => { TerrainCollisionMargin = cf.GetFloat(p, v); },
388 (s) => { return TerrainCollisionMargin; }, 388 (s) => { return TerrainCollisionMargin; },
389 (s,p,l,v) => { TerrainCollisionMargin = v; /* TODO: set on real terrain */ } ), 389 (s,p,l,v) => { TerrainCollisionMargin = v; /* TODO: set on real terrain */ } ),