From 2a988f187ec4c743d6b269fc3a8fe32d84716f65 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Wed, 14 May 2008 23:15:25 +0000 Subject: * 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. --- OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | 5 +++-- OpenSim/Region/Physics/Manager/PhysicsScene.cs | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region/Physics/Manager') diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs index e4ff725..b8ca180 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs @@ -29,6 +29,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Reflection; +using Nini.Config; using log4net; namespace OpenSim.Region.Physics.Manager @@ -47,7 +48,7 @@ namespace OpenSim.Region.Physics.Manager { } - public PhysicsScene GetPhysicsScene(string physEngineName, string meshEngineName) + public PhysicsScene GetPhysicsScene(string physEngineName, string meshEngineName, IConfigSource config) { if (String.IsNullOrEmpty(physEngineName)) { @@ -75,7 +76,7 @@ namespace OpenSim.Region.Physics.Manager { m_log.Info("[PHYSICS]: creating " + physEngineName); PhysicsScene result = _PhysPlugins[physEngineName].GetScene(); - result.Initialise(meshEngine); + result.Initialise(meshEngine, config); return result; } else diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 4c509b7..de93f22 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs @@ -28,6 +28,7 @@ using System.Reflection; using Axiom.Math; using log4net; +using Nini.Config; using OpenSim.Framework; namespace OpenSim.Region.Physics.Manager @@ -58,7 +59,7 @@ namespace OpenSim.Region.Physics.Manager } - public abstract void Initialise(IMesher meshmerizer); + public abstract void Initialise(IMesher meshmerizer, IConfigSource config); public abstract PhysicsActor AddAvatar(string avName, PhysicsVector position, PhysicsVector size); @@ -92,7 +93,7 @@ namespace OpenSim.Region.Physics.Manager private static int m_workIndicator; - public override void Initialise(IMesher meshmerizer) + public override void Initialise(IMesher meshmerizer, IConfigSource config) { // Does nothing right now } -- cgit v1.1