OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BulletSim: use heightmap terrain when using BulletXNA. 

Output messages on features disabled when using BulletXNA.
user_profiles
Robert Adams 2013-05-13 08:40:24 -07:00
parent 4194d935ec
commit 45f37e11ad
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
View File

@ -90,7 +90,7 @@ public static class BSParam
public static bool ShouldUseBulletHACD { get; set; } public static bool ShouldUseBulletHACD { get; set; }
public static bool ShouldUseSingleConvexHullForPrims { get; set; } public static bool ShouldUseSingleConvexHullForPrims { get; set; }
public static float TerrainImplementation { get; private set; } public static float TerrainImplementation { get; set; }
public static int TerrainMeshMagnification { get; private set; } public static int TerrainMeshMagnification { get; private set; }
public static float TerrainFriction { get; private set; } public static float TerrainFriction { get; private set; }
public static float TerrainHitFraction { get; private set; } public static float TerrainHitFraction { get; private set; }

4
OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
View File

@ -318,8 +318,12 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
ret = new BSAPIXNA(engineName, this); ret = new BSAPIXNA(engineName, this);
// Disable some features that are not implemented in BulletXNA // Disable some features that are not implemented in BulletXNA
m_log.InfoFormat("{0} Disabling some physics features not implemented by BulletXNA", LogHeader); m_log.InfoFormat("{0} Disabling some physics features not implemented by BulletXNA", LogHeader);
m_log.InfoFormat("{0} Disabling ShouldUseBulletHACD", LogHeader);
BSParam.ShouldUseBulletHACD = false; BSParam.ShouldUseBulletHACD = false;
m_log.InfoFormat("{0} Disabling ShouldUseSingleConvexHullForPrims", LogHeader);
BSParam.ShouldUseSingleConvexHullForPrims = false; BSParam.ShouldUseSingleConvexHullForPrims = false;
m_log.InfoFormat("{0} Setting terrain implimentation to Heightmap", LogHeader);
BSParam.TerrainImplementation = (float)BSTerrainPhys.TerrainImplementation.Heightmap;
break; break;
} }