aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-05-14 23:15:25 +0000
committerTeravus Ovares2008-05-14 23:15:25 +0000
commit2a988f187ec4c743d6b269fc3a8fe32d84716f65 (patch)
tree728d7e4ef601ed0630b0a7f156c63512966603c0 /OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
parent* Start recording as a statistic the number of times we start blocking repeti... (diff)
downloadopensim-SC_OLD-2a988f187ec4c743d6b269fc3a8fe32d84716f65.zip
opensim-SC_OLD-2a988f187ec4c743d6b269fc3a8fe32d84716f65.tar.gz
opensim-SC_OLD-2a988f187ec4c743d6b269fc3a8fe32d84716f65.tar.bz2
opensim-SC_OLD-2a988f187ec4c743d6b269fc3a8fe32d84716f65.tar.xz
* Refactored IConfigSource into Physics plug-ins and Scene. We can get rid of some of the parameters we pass to it's constructor now like, 'm_allowPhysicalPrim', 'seeIntoOtherRegions', etc.. so on
* The main purpose of this is to provide configuration options for ODE and other physics plug-ins that are advanced enough to be able to be configured.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
index ddfb5a4..9415fff 100644
--- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
+++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
@@ -34,6 +34,7 @@ using OpenSim.Framework;
34using OpenSim.Region.Physics.Manager; 34using OpenSim.Region.Physics.Manager;
35using XnaDevRu.BulletX; 35using XnaDevRu.BulletX;
36using XnaDevRu.BulletX.Dynamics; 36using XnaDevRu.BulletX.Dynamics;
37using Nini.Config;
37using AxiomQuaternion = Axiom.Math.Quaternion; 38using AxiomQuaternion = Axiom.Math.Quaternion;
38 39
39#endregion 40#endregion
@@ -483,6 +484,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin
483 internal Dictionary<RigidBody, BulletXPrim> _prims = new Dictionary<RigidBody, BulletXPrim>(); 484 internal Dictionary<RigidBody, BulletXPrim> _prims = new Dictionary<RigidBody, BulletXPrim>();
484 485
485 public IMesher mesher; 486 public IMesher mesher;
487 private IConfigSource m_config;
486 488
487 489
488 public static float Gravity 490 public static float Gravity
@@ -536,9 +538,10 @@ namespace OpenSim.Region.Physics.BulletXPlugin
536 //this._heightmap = new float[65536]; 538 //this._heightmap = new float[65536];
537 } 539 }
538 540
539 public override void Initialise(IMesher meshmerizer) 541 public override void Initialise(IMesher meshmerizer, IConfigSource config)
540 { 542 {
541 mesher = meshmerizer; 543 mesher = meshmerizer;
544 m_config = config;
542 } 545 }
543 546
544 public override void Dispose() 547 public override void Dispose()