Some work on restructuring the namespaces / project names. Note this doesn't compile yet as not all the code has been changed to use the new namespaces. Am committing it now for feedback on the namespaces.

author: MW 2007-06-27 15:28:52 +0000
committer: MW 2007-06-27 15:28:52 +0000
commit: 646bbbc84b8010e0dacbeed5342cdb045f46cc49 (patch)
tree: 770b34d19855363c3c113ab9a0af9a56d821d887 /OpenSim/Region/Physics/Manager/PhysicsScene.cs
download: opensim-SC-646bbbc84b8010e0dacbeed5342cdb045f46cc49.zip
opensim-SC-646bbbc84b8010e0dacbeed5342cdb045f46cc49.tar.gz
opensim-SC-646bbbc84b8010e0dacbeed5342cdb045f46cc49.tar.bz2
opensim-SC-646bbbc84b8010e0dacbeed5342cdb045f46cc49.tar.xz
1 files changed, 113 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
new file mode 100644
index 0000000..0901c2f
--- /dev/null
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -0,0 +1,113 @@
+/*
+* 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.Text;
+using OpenSim.Framework.Console;
+namespace OpenSim.Physics.Manager
+{
+    public abstract class PhysicsScene
+    {
+        public static PhysicsScene Null
+        {
+            get
+            {
+                return new NullPhysicsScene();
+            }
+        }
+        public abstract PhysicsActor AddAvatar(PhysicsVector position);
+        public abstract void RemoveAvatar(PhysicsActor actor);
+        public abstract PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size);
+        public abstract void Simulate(float timeStep);
+        public abstract void GetResults();
+        public abstract void SetTerrain(float[] heightMap);
+        
+        public abstract void DeleteTerrain();
+        public abstract bool IsThreaded
+        {
+            get;
+        }
+    }
+    public class NullPhysicsScene : PhysicsScene
+    {
+        private static int m_workIndicator;
+        public override PhysicsActor AddAvatar(PhysicsVector position)
+        {
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position);
+            return PhysicsActor.Null;
+        }
+        public override void RemoveAvatar(PhysicsActor actor)
+        {
+        }
+        public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
+        {
+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "NullPhysicsScene : AddPrim({0},{1})", position, size);
+            return PhysicsActor.Null;
+        }
+        public override void Simulate(float timeStep)
+        {
+            m_workIndicator = (m_workIndicator + 1) % 10;
+            //OpenSim.Framework.Console.MainLog.Instance.SetStatus(m_workIndicator.ToString());
+        }
+        public override void GetResults()
+        {
+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "NullPhysicsScene : GetResults()");
+        }
+        public override void SetTerrain(float[] heightMap)
+        {
+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
+        }
+        public override void DeleteTerrain()
+        {
+        }
+        public override bool IsThreaded
+        {
+            get { return false; }
+        }
+    }
+}
author	MW	2007-06-27 15:28:52 +0000
committer	MW	2007-06-27 15:28:52 +0000
commit	646bbbc84b8010e0dacbeed5342cdb045f46cc49 (patch)
tree	770b34d19855363c3c113ab9a0af9a56d821d887 /OpenSim/Region/Physics/Manager/PhysicsScene.cs
download	opensim-SC-646bbbc84b8010e0dacbeed5342cdb045f46cc49.zip opensim-SC-646bbbc84b8010e0dacbeed5342cdb045f46cc49.tar.gz opensim-SC-646bbbc84b8010e0dacbeed5342cdb045f46cc49.tar.bz2 opensim-SC-646bbbc84b8010e0dacbeed5342cdb045f46cc49.tar.xz

diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs new file mode 100644 index 0000000..0901c2f --- /dev/null +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -0,0 +1,113 @@
	1	/*
	2	* Copyright (c) Contributors, http://www.openmetaverse.org/
	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
	4	*
	5	* Redistribution and use in source and binary forms, with or without
	6	* modification, are permitted provided that the following conditions are met:
	7	* * Redistributions of source code must retain the above copyright
	8	* notice, this list of conditions and the following disclaimer.
	9	* * Redistributions in binary form must reproduce the above copyright
	10	* notice, this list of conditions and the following disclaimer in the
	11	* documentation and/or other materials provided with the distribution.
	12	* * Neither the name of the OpenSim Project nor the
	13	* names of its contributors may be used to endorse or promote products
	14	* derived from this software without specific prior written permission.
	15	*
	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
	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
	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
	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	26	*
	27	*/
	28	using System;
	29	using System.Collections.Generic;
	30	using System.Text;
	31	using OpenSim.Framework.Console;
	32
	33	namespace OpenSim.Physics.Manager
	34	{
	35	public abstract class PhysicsScene
	36	{
	37	public static PhysicsScene Null
	38	{
	39	get
	40	{
	41	return new NullPhysicsScene();
	42	}
	43	}
	44
	45	public abstract PhysicsActor AddAvatar(PhysicsVector position);
	46
	47	public abstract void RemoveAvatar(PhysicsActor actor);
	48
	49	public abstract PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size);
	50
	51	public abstract void Simulate(float timeStep);
	52
	53	public abstract void GetResults();
	54
	55	public abstract void SetTerrain(float[] heightMap);
	56
	57	public abstract void DeleteTerrain();
	58
	59	public abstract bool IsThreaded
	60	{
	61	get;
	62	}
	63	}
	64
	65	public class NullPhysicsScene : PhysicsScene
	66	{
	67	private static int m_workIndicator;
	68
	69	public override PhysicsActor AddAvatar(PhysicsVector position)
	70	{
	71	OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position);
	72	return PhysicsActor.Null;
	73	}
	74
	75	public override void RemoveAvatar(PhysicsActor actor)
	76	{
	77
	78	}
	79
	80	public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
	81	{
	82	OpenSim.Framework.Console.MainLog.Instance.Verbose( "NullPhysicsScene : AddPrim({0},{1})", position, size);
	83	return PhysicsActor.Null;
	84	}
	85
	86	public override void Simulate(float timeStep)
	87	{
	88	m_workIndicator = (m_workIndicator + 1) % 10;
	89
	90	//OpenSim.Framework.Console.MainLog.Instance.SetStatus(m_workIndicator.ToString());
	91	}
	92
	93	public override void GetResults()
	94	{
	95	OpenSim.Framework.Console.MainLog.Instance.Verbose( "NullPhysicsScene : GetResults()");
	96	}
	97
	98	public override void SetTerrain(float[] heightMap)
	99	{
	100	OpenSim.Framework.Console.MainLog.Instance.Verbose( "NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
	101	}
	102
	103	public override void DeleteTerrain()
	104	{
	105
	106	}
	107
	108	public override bool IsThreaded
	109	{
	110	get { return false; }
	111	}
	112	}
	113	}