aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRobert Adams2013-05-13 08:40:24 -0700
committerRobert Adams2013-05-13 13:30:40 -0700
commit45f37e11ad6e9a9917a6ea07ec52dec9058393f0 (patch)
treec40d6010263743843b84017825a41e4447921f5b
parentFixed mantis #6609 -- LoadPlugin error messages on Robust. (diff)
downloadopensim-SC_OLD-45f37e11ad6e9a9917a6ea07ec52dec9058393f0.zip
opensim-SC_OLD-45f37e11ad6e9a9917a6ea07ec52dec9058393f0.tar.gz
opensim-SC_OLD-45f37e11ad6e9a9917a6ea07ec52dec9058393f0.tar.bz2
opensim-SC_OLD-45f37e11ad6e9a9917a6ea07ec52dec9058393f0.tar.xz
BulletSim: use heightmap terrain when using BulletXNA.
Output messages on features disabled when using BulletXNA.
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSParam.cs2
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSScene.cs4
2 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 3ca7e16..5504478 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -90,7 +90,7 @@ public static class BSParam
90 public static bool ShouldUseBulletHACD { get; set; } 90 public static bool ShouldUseBulletHACD { get; set; }
91 public static bool ShouldUseSingleConvexHullForPrims { get; set; } 91 public static bool ShouldUseSingleConvexHullForPrims { get; set; }
92 92
93 public static float TerrainImplementation { get; private set; } 93 public static float TerrainImplementation { get; set; }
94 public static int TerrainMeshMagnification { get; private set; } 94 public static int TerrainMeshMagnification { get; private set; }
95 public static float TerrainFriction { get; private set; } 95 public static float TerrainFriction { get; private set; }
96 public static float TerrainHitFraction { get; private set; } 96 public static float TerrainHitFraction { get; private set; }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index a4a8794..3f407ce 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -318,8 +318,12 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
318 ret = new BSAPIXNA(engineName, this); 318 ret = new BSAPIXNA(engineName, this);
319 // Disable some features that are not implemented in BulletXNA 319 // Disable some features that are not implemented in BulletXNA
320 m_log.InfoFormat("{0} Disabling some physics features not implemented by BulletXNA", LogHeader); 320 m_log.InfoFormat("{0} Disabling some physics features not implemented by BulletXNA", LogHeader);
321 m_log.InfoFormat("{0} Disabling ShouldUseBulletHACD", LogHeader);
321 BSParam.ShouldUseBulletHACD = false; 322 BSParam.ShouldUseBulletHACD = false;
323 m_log.InfoFormat("{0} Disabling ShouldUseSingleConvexHullForPrims", LogHeader);
322 BSParam.ShouldUseSingleConvexHullForPrims = false; 324 BSParam.ShouldUseSingleConvexHullForPrims = false;
325 m_log.InfoFormat("{0} Setting terrain implimentation to Heightmap", LogHeader);
326 BSParam.TerrainImplementation = (float)BSTerrainPhys.TerrainImplementation.Heightmap;
323 break; 327 break;
324 } 328 }
325 329