aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
diff options
context:
space:
mode:
authorRobert Adams2011-08-29 10:00:58 -0700
committerMic Bowman2011-08-29 10:10:48 -0700
commit96dce3e16c3c0b861e42e6331f693b6b00a14392 (patch)
tree8910d3e3adf91cc26e9b4c3013b1c7d9a3c098a6 /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
parentMerge branch 'master' into bulletsim (diff)
downloadopensim-SC-96dce3e16c3c0b861e42e6331f693b6b00a14392.zip
opensim-SC-96dce3e16c3c0b861e42e6331f693b6b00a14392.tar.gz
opensim-SC-96dce3e16c3c0b861e42e6331f693b6b00a14392.tar.bz2
opensim-SC-96dce3e16c3c0b861e42e6331f693b6b00a14392.tar.xz
Use GetMeshKey from PrimitiveBaseShape.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSScene.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSScene.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index e91455a..7704002 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -73,13 +73,13 @@ public class BSScene : PhysicsScene, IPhysicsParameters
73 private bool m_initialized = false; 73 private bool m_initialized = false;
74 74
75 public IMesher mesher; 75 public IMesher mesher;
76 private int m_meshLOD; 76 private float m_meshLOD;
77 public int MeshLOD 77 public float MeshLOD
78 { 78 {
79 get { return m_meshLOD; } 79 get { return m_meshLOD; }
80 } 80 }
81 private int m_sculptLOD; 81 private float m_sculptLOD;
82 public int SculptLOD 82 public float SculptLOD
83 { 83 {
84 get { return m_sculptLOD; } 84 get { return m_sculptLOD; }
85 } 85 }
@@ -189,8 +189,8 @@ public class BSScene : PhysicsScene, IPhysicsParameters
189 _meshSculptedPrim = true; // mesh sculpted prims 189 _meshSculptedPrim = true; // mesh sculpted prims
190 _forceSimplePrimMeshing = false; // use complex meshing if called for 190 _forceSimplePrimMeshing = false; // use complex meshing if called for
191 191
192 m_meshLOD = 8; 192 m_meshLOD = 8f;
193 m_sculptLOD = 32; 193 m_sculptLOD = 32f;
194 194
195 m_maxSubSteps = 10; 195 m_maxSubSteps = 10;
196 m_fixedTimeStep = 1f / 60f; 196 m_fixedTimeStep = 1f / 60f;
@@ -231,8 +231,8 @@ public class BSScene : PhysicsScene, IPhysicsParameters
231 _meshSculptedPrim = pConfig.GetBoolean("MeshSculptedPrim", _meshSculptedPrim); 231 _meshSculptedPrim = pConfig.GetBoolean("MeshSculptedPrim", _meshSculptedPrim);
232 _forceSimplePrimMeshing = pConfig.GetBoolean("ForceSimplePrimMeshing", _forceSimplePrimMeshing); 232 _forceSimplePrimMeshing = pConfig.GetBoolean("ForceSimplePrimMeshing", _forceSimplePrimMeshing);
233 233
234 m_meshLOD = pConfig.GetInt("MeshLevelOfDetail", m_meshLOD); 234 m_meshLOD = pConfig.GetFloat("MeshLevelOfDetail", m_meshLOD);
235 m_sculptLOD = pConfig.GetInt("SculptLevelOfDetail", m_sculptLOD); 235 m_sculptLOD = pConfig.GetFloat("SculptLevelOfDetail", m_sculptLOD);
236 236
237 m_maxSubSteps = pConfig.GetInt("MaxSubSteps", m_maxSubSteps); 237 m_maxSubSteps = pConfig.GetInt("MaxSubSteps", m_maxSubSteps);
238 m_fixedTimeStep = pConfig.GetFloat("FixedTimeStep", m_fixedTimeStep); 238 m_fixedTimeStep = pConfig.GetFloat("FixedTimeStep", m_fixedTimeStep);