aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
diff options
context:
space:
mode:
authorRobert Adams2012-07-26 14:54:57 -0700
committerRobert Adams2012-07-26 16:05:57 -0700
commit7d30637d51c64a582cc55d41546af8f0cfc889ba (patch)
tree50b9899f149f434bed037be91983b4b0453782b7 /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-7d30637d51c64a582cc55d41546af8f0cfc889ba.zip
opensim-SC-7d30637d51c64a582cc55d41546af8f0cfc889ba.tar.gz
opensim-SC-7d30637d51c64a582cc55d41546af8f0cfc889ba.tar.bz2
opensim-SC-7d30637d51c64a582cc55d41546af8f0cfc889ba.tar.xz
BulletSim: refactor all the linkset logic out of the prim class
and into its own class. The BulletSim data structures track individual prims as linksets of 1 so most of the prim code is not different between a linked and unlinked object.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSScene.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index a1587a8..c6d622b 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -73,7 +73,7 @@ public class BSScene : PhysicsScene, IPhysicsParameters
73 private static readonly ILog m_log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 73 private static readonly ILog m_log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
74 private static readonly string LogHeader = "[BULLETS SCENE]"; 74 private static readonly string LogHeader = "[BULLETS SCENE]";
75 75
76 private void DebugLog(string mm, params Object[] xx) { if (shouldDebugLog) m_log.DebugFormat(mm, xx); } 76 public void DebugLog(string mm, params Object[] xx) { if (shouldDebugLog) m_log.DebugFormat(mm, xx); }
77 77
78 public string BulletSimVersion = "?"; 78 public string BulletSimVersion = "?";
79 79
@@ -87,6 +87,9 @@ public class BSScene : PhysicsScene, IPhysicsParameters
87 private uint m_worldID; 87 private uint m_worldID;
88 public uint WorldID { get { return m_worldID; } } 88 public uint WorldID { get { return m_worldID; } }
89 89
90 // let my minuions use my logger
91 public ILog Logger { get { return m_log; } }
92
90 private bool m_initialized = false; 93 private bool m_initialized = false;
91 94
92 private int m_detailedStatsStep = 0; 95 private int m_detailedStatsStep = 0;
@@ -1026,7 +1029,7 @@ public class BSScene : PhysicsScene, IPhysicsParameters
1026 (s,p,l,v) => { s.m_params[0].numberOfSolverIterations = v; } ), 1029 (s,p,l,v) => { s.m_params[0].numberOfSolverIterations = v; } ),
1027 1030
1028 new ParameterDefn("LinkConstraintUseFrameOffset", "For linksets built with constraints, enable frame offsetFor linksets built with constraints, enable frame offset.", 1031 new ParameterDefn("LinkConstraintUseFrameOffset", "For linksets built with constraints, enable frame offsetFor linksets built with constraints, enable frame offset.",
1029 ConfigurationParameters.numericTrue, 1032 ConfigurationParameters.numericFalse,
1030 (s,cf,p,v) => { s.m_params[0].linkConstraintUseFrameOffset = s.NumericBool(cf.GetBoolean(p, s.BoolNumeric(v))); }, 1033 (s,cf,p,v) => { s.m_params[0].linkConstraintUseFrameOffset = s.NumericBool(cf.GetBoolean(p, s.BoolNumeric(v))); },
1031 (s) => { return s.m_params[0].linkConstraintUseFrameOffset; }, 1034 (s) => { return s.m_params[0].linkConstraintUseFrameOffset; },
1032 (s,p,l,v) => { s.m_params[0].linkConstraintUseFrameOffset = v; } ), 1035 (s,p,l,v) => { s.m_params[0].linkConstraintUseFrameOffset = v; } ),