From 58f4d6983351563719b8488957ab7885b3e9482b Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Mon, 16 Jul 2007 18:15:54 +0000 Subject: * working on RegionApplicationBase * Renamed PhysicsManager to PhysicsPluginManager because it is. --- OpenSim/Region/Application/OpenSimMain.cs | 2 +- .../Region/ClientStack/RegionApplicationBase.cs | 2 +- OpenSim/Region/Examples/SimpleApp/Program.cs | 2 +- OpenSim/Region/Physics/Manager/PhysicsManager.cs | 115 --------------------- .../Region/Physics/Manager/PhysicsPluginManager.cs | 115 +++++++++++++++++++++ 5 files changed, 118 insertions(+), 118 deletions(-) delete mode 100644 OpenSim/Region/Physics/Manager/PhysicsManager.cs create mode 100644 OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs (limited to 'OpenSim') diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 269c54c..d7bed31 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs @@ -119,7 +119,7 @@ namespace OpenSim startuptime = DateTime.Now; - this.m_physicsManager = new PhysicsManager(); + this.m_physicsManager = new PhysicsPluginManager(); this.m_physicsManager.LoadPlugins(); this.SetupScene(); diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index 610f2d9..b67fdfa 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs @@ -42,7 +42,7 @@ namespace OpenSim.Region.ClientStack { public class RegionApplicationBase { - protected PhysicsManager m_physicsManager; + protected PhysicsPluginManager m_physicsManager; protected AssetCache AssetCache; protected InventoryCache InventoryCache; protected Dictionary clientCircuits = new Dictionary(); diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs index f82bdcb..131159e 100644 --- a/OpenSim/Region/Examples/SimpleApp/Program.cs +++ b/OpenSim/Region/Examples/SimpleApp/Program.cs @@ -50,7 +50,7 @@ namespace SimpleApp ScenePresence.LoadTextureFile("avatar-texture.dat"); ScenePresence.PhysicsEngineFlying = true; - PhysicsManager physManager = new PhysicsManager(); + PhysicsPluginManager physManager = new PhysicsPluginManager(); physManager.LoadPlugins(); UDPServer udpServer = new UDPServer(internalEndPoint.Port, assetCache, inventoryCache, m_log, m_circuitManager); diff --git a/OpenSim/Region/Physics/Manager/PhysicsManager.cs b/OpenSim/Region/Physics/Manager/PhysicsManager.cs deleted file mode 100644 index 7c475e7..0000000 --- a/OpenSim/Region/Physics/Manager/PhysicsManager.cs +++ /dev/null @@ -1,115 +0,0 @@ -/* -* Copyright (c) Contributors, http://www.openmetaverse.org/ -* See CONTRIBUTORS.TXT for a full list of copyright holders. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the OpenSim Project nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -*/ -using System; -using System.Collections.Generic; -using System.IO; -using System.Reflection; -using OpenSim.Framework.Console; - -namespace OpenSim.Physics.Manager -{ - /// - /// Description of MyClass. - /// - public class PhysicsManager - { - private Dictionary _plugins=new Dictionary(); - - public PhysicsManager() - { - - } - - public PhysicsScene GetPhysicsScene(string engineName) - { - if (String.IsNullOrEmpty(engineName)) - { - return PhysicsScene.Null; - } - - if(_plugins.ContainsKey(engineName)) - { - MainLog.Instance.WriteLine(LogPriority.LOW,"creating "+engineName); - return _plugins[engineName].GetScene(); - } - else - { - MainLog.Instance.WriteLine(LogPriority.MEDIUM,"couldn't find physicsEngine: {0}",engineName); - throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName)); - } - } - - public void LoadPlugins() - { - string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory ,"Physics"); - string[] pluginFiles = Directory.GetFiles(path, "*.dll"); - - - for(int i= 0; i + /// Description of MyClass. + /// + public class PhysicsPluginManager + { + private Dictionary _plugins=new Dictionary(); + + public PhysicsPluginManager() + { + + } + + public PhysicsScene GetPhysicsScene(string engineName) + { + if (String.IsNullOrEmpty(engineName)) + { + return PhysicsScene.Null; + } + + if(_plugins.ContainsKey(engineName)) + { + MainLog.Instance.WriteLine(LogPriority.LOW,"creating "+engineName); + return _plugins[engineName].GetScene(); + } + else + { + MainLog.Instance.WriteLine(LogPriority.MEDIUM,"couldn't find physicsEngine: {0}",engineName); + throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName)); + } + } + + public void LoadPlugins() + { + string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory ,"Physics"); + string[] pluginFiles = Directory.GetFiles(path, "*.dll"); + + + for(int i= 0; i