1 files changed, 115 insertions, 115 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsManager.cs b/OpenSim/Region/Physics/Manager/PhysicsManager.cs
index 265bce6..7c475e7 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsManager.cs
@@ -1,115 +1,115 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* 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
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.IO;
+using System.IO;
-using System.Reflection;
+using System.Reflection;
-using OpenSim.Framework.Console;
+using OpenSim.Framework.Console;
-namespace OpenSim.Physics.Manager
+namespace OpenSim.Physics.Manager
-{
+{
-        /// <summary>
+        /// <summary>
-        /// Description of MyClass.
+        /// Description of MyClass.
-        /// </summary>
+        /// </summary>
-        public class PhysicsManager
+        public class PhysicsManager
-        {
+        {
-                private Dictionary<string, IPhysicsPlugin> _plugins=new Dictionary<string, IPhysicsPlugin>();
+                private Dictionary<string, IPhysicsPlugin> _plugins=new Dictionary<string, IPhysicsPlugin>();
-                
+                
-                public PhysicsManager()
+                public PhysicsManager()
-                {
+                {
-                        
+                        
-                }
+                }
-                
+                
-                public PhysicsScene GetPhysicsScene(string engineName)
+                public PhysicsScene GetPhysicsScene(string engineName)
-                {
+                {
-            if (String.IsNullOrEmpty(engineName))
+            if (String.IsNullOrEmpty(engineName))
-            {
+            {
-                return PhysicsScene.Null;
+                return PhysicsScene.Null;
-            }
+            }
-                        if(_plugins.ContainsKey(engineName))
+                        if(_plugins.ContainsKey(engineName))
-                        {
+                        {
-                                MainLog.Instance.WriteLine(LogPriority.LOW,"creating "+engineName);
+                                MainLog.Instance.WriteLine(LogPriority.LOW,"creating "+engineName);
-                                return _plugins[engineName].GetScene();
+                                return _plugins[engineName].GetScene();
-                        }
+                        }
-                        else
+                        else
-            {
+            {
-                MainLog.Instance.WriteLine(LogPriority.MEDIUM,"couldn't find physicsEngine: {0}",engineName);
+                MainLog.Instance.WriteLine(LogPriority.MEDIUM,"couldn't find physicsEngine: {0}",engineName);
-                throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName));
+                throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName));
-                        }
+                        }
-                }
+                }
-                
+                
-                public void LoadPlugins()
+                public void LoadPlugins()
-                {
+                {
-                        string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory ,"Physics");
+                        string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory ,"Physics");
-                string[] pluginFiles = Directory.GetFiles(path, "*.dll");
+                string[] pluginFiles = Directory.GetFiles(path, "*.dll");
-        
+        
-                for(int i= 0; i<pluginFiles.Length; i++)
+                for(int i= 0; i<pluginFiles.Length; i++)
-                {
+                {
-                        this.AddPlugin(pluginFiles[i]);
+                        this.AddPlugin(pluginFiles[i]);
-                }
+                }
-        }
+        }
-                
+                
-                private void AddPlugin(string FileName)
+                private void AddPlugin(string FileName)
-                {
+                {
-                        Assembly pluginAssembly = Assembly.LoadFrom(FileName);
+                        Assembly pluginAssembly = Assembly.LoadFrom(FileName);
-                        
+                        
-                        foreach (Type pluginType in pluginAssembly.GetTypes())
+                        foreach (Type pluginType in pluginAssembly.GetTypes())
-                        {
+                        {
-                                if (pluginType.IsPublic) 
+                                if (pluginType.IsPublic) 
-                                {
+                                {
-                                        if (!pluginType.IsAbstract)  
+                                        if (!pluginType.IsAbstract)  
-                                        {
+                                        {
-                                                Type typeInterface = pluginType.GetInterface("IPhysicsPlugin", true);
+                                                Type typeInterface = pluginType.GetInterface("IPhysicsPlugin", true);
-                                                
+                                                
-                                                if (typeInterface != null)
+                                                if (typeInterface != null)
-                                                {
+                                                {
-                                                        IPhysicsPlugin plug = (IPhysicsPlugin)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+                                                        IPhysicsPlugin plug = (IPhysicsPlugin)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                                                        plug.Init();
+                                                        plug.Init();
-                                                        this._plugins.Add(plug.GetName(),plug);
+                                                        this._plugins.Add(plug.GetName(),plug);
-                                                        
+                                                        
-                                                }       
+                                                }       
-                                                
+                                                
-                                                typeInterface = null;                   
+                                                typeInterface = null;                   
-                                        }                               
+                                        }                               
-                                }                       
+                                }                       
-                        }
+                        }
-                        
+                        
-                        pluginAssembly = null; 
+                        pluginAssembly = null; 
-                }
+                }
-        }
+        }
-        public interface IPhysicsPlugin
+        public interface IPhysicsPlugin
-        {
+        {
-                bool Init();
+                bool Init();
-                PhysicsScene GetScene();
+                PhysicsScene GetScene();
-                string GetName();
+                string GetName();
-                void Dispose();
+                void Dispose();
-        }
+        }
-}
+}

diff --git a/OpenSim/Region/Physics/Manager/PhysicsManager.cs b/OpenSim/Region/Physics/Manager/PhysicsManager.cs index 265bce6..7c475e7 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsManager.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsManager.cs
@@ -1,115 +1,115 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://www.openmetaverse.org/	2	* Copyright (c) Contributors, http://www.openmetaverse.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright	7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.	8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright	9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the	10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.	11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSim Project nor the	12	* * Neither the name of the OpenSim Project nor the
13	* names of its contributors may be used to endorse or promote products	13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.	14	* derived from this software without specific prior written permission.
15	*	15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND	22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS	24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*	26	*
27	*/	27	*/
28	using System;	28	using System;
29	using System.Collections.Generic;	29	using System.Collections.Generic;
30	using System.IO;	30	using System.IO;
31	using System.Reflection;	31	using System.Reflection;
32	using OpenSim.Framework.Console;	32	using OpenSim.Framework.Console;
33		33
34	namespace OpenSim.Physics.Manager	34	namespace OpenSim.Physics.Manager
35	{	35	{
36	/// <summary>	36	/// <summary>
37	/// Description of MyClass.	37	/// Description of MyClass.
38	/// </summary>	38	/// </summary>
39	public class PhysicsManager	39	public class PhysicsManager
40	{	40	{
41	private Dictionary<string, IPhysicsPlugin> _plugins=new Dictionary<string, IPhysicsPlugin>();	41	private Dictionary<string, IPhysicsPlugin> _plugins=new Dictionary<string, IPhysicsPlugin>();
42		42
43	public PhysicsManager()	43	public PhysicsManager()
44	{	44	{
45		45
46	}	46	}
47		47
48	public PhysicsScene GetPhysicsScene(string engineName)	48	public PhysicsScene GetPhysicsScene(string engineName)
49	{	49	{
50	if (String.IsNullOrEmpty(engineName))	50	if (String.IsNullOrEmpty(engineName))
51	{	51	{
52	return PhysicsScene.Null;	52	return PhysicsScene.Null;
53	}	53	}
54		54
55	if(_plugins.ContainsKey(engineName))	55	if(_plugins.ContainsKey(engineName))
56	{	56	{
57	MainLog.Instance.WriteLine(LogPriority.LOW,"creating "+engineName);	57	MainLog.Instance.WriteLine(LogPriority.LOW,"creating "+engineName);
58	return _plugins[engineName].GetScene();	58	return _plugins[engineName].GetScene();
59	}	59	}
60	else	60	else
61	{	61	{
62	MainLog.Instance.WriteLine(LogPriority.MEDIUM,"couldn't find physicsEngine: {0}",engineName);	62	MainLog.Instance.WriteLine(LogPriority.MEDIUM,"couldn't find physicsEngine: {0}",engineName);
63	throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName));	63	throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName));
64	}	64	}
65	}	65	}
66		66
67	public void LoadPlugins()	67	public void LoadPlugins()
68	{	68	{
69	string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory ,"Physics");	69	string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory ,"Physics");
70	string[] pluginFiles = Directory.GetFiles(path, "*.dll");	70	string[] pluginFiles = Directory.GetFiles(path, "*.dll");
71		71
72		72
73	for(int i= 0; i<pluginFiles.Length; i++)	73	for(int i= 0; i<pluginFiles.Length; i++)
74	{	74	{
75	this.AddPlugin(pluginFiles[i]);	75	this.AddPlugin(pluginFiles[i]);
76	}	76	}
77	}	77	}
78		78
79	private void AddPlugin(string FileName)	79	private void AddPlugin(string FileName)
80	{	80	{
81	Assembly pluginAssembly = Assembly.LoadFrom(FileName);	81	Assembly pluginAssembly = Assembly.LoadFrom(FileName);
82		82
83	foreach (Type pluginType in pluginAssembly.GetTypes())	83	foreach (Type pluginType in pluginAssembly.GetTypes())
84	{	84	{
85	if (pluginType.IsPublic)	85	if (pluginType.IsPublic)
86	{	86	{
87	if (!pluginType.IsAbstract)	87	if (!pluginType.IsAbstract)
88	{	88	{
89	Type typeInterface = pluginType.GetInterface("IPhysicsPlugin", true);	89	Type typeInterface = pluginType.GetInterface("IPhysicsPlugin", true);
90		90
91	if (typeInterface != null)	91	if (typeInterface != null)
92	{	92	{
93	IPhysicsPlugin plug = (IPhysicsPlugin)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));	93	IPhysicsPlugin plug = (IPhysicsPlugin)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
94	plug.Init();	94	plug.Init();
95	this._plugins.Add(plug.GetName(),plug);	95	this._plugins.Add(plug.GetName(),plug);
96		96
97	}	97	}
98		98
99	typeInterface = null;	99	typeInterface = null;
100	}	100	}
101	}	101	}
102	}	102	}
103		103
104	pluginAssembly = null;	104	pluginAssembly = null;
105	}	105	}
106	}	106	}
107		107
108	public interface IPhysicsPlugin	108	public interface IPhysicsPlugin
109	{	109	{
110	bool Init();	110	bool Init();
111	PhysicsScene GetScene();	111	PhysicsScene GetScene();
112	string GetName();	112	string GetName();
113	void Dispose();	113	void Dispose();
114	}	114	}
115	}	115	}