fixed last screwup

author: gareth 2007-03-07 19:07:00 +0000
committer: gareth 2007-03-07 19:07:00 +0000
commit: 2159b3079ec8df2a7337a9d4ea54810b7028c4e1 (patch)
tree: 5473123011f7a302e63f89ec6ccb4477032fd1db /src/world/World.cs
parent: Imported branch (diff)
download: opensim-SC-2159b3079ec8df2a7337a9d4ea54810b7028c4e1.zip
opensim-SC-2159b3079ec8df2a7337a9d4ea54810b7028c4e1.tar.gz
opensim-SC-2159b3079ec8df2a7337a9d4ea54810b7028c4e1.tar.bz2
opensim-SC-2159b3079ec8df2a7337a9d4ea54810b7028c4e1.tar.xz
1 files changed, 117 insertions, 0 deletions
diff --git a/src/world/World.cs b/src/world/World.cs
new file mode 100644
index 0000000..8427a38
--- /dev/null
+++ b/src/world/World.cs
@@ -0,0 +1,117 @@
+using System;
+using libsecondlife;
+using libsecondlife.Packets;
+using System.Collections.Generic;
+using System.Text;
+using PhysicsSystem;
+namespace OpenSim.world
+{
+    public class World
+    {
+        public Dictionary<libsecondlife.LLUUID, Entity> Entities;
+        public float[] LandMap;
+        public ScriptEngine Scripts;
+        public uint _localNumber=0;
+        private PhysicsScene phyScene;
+        private float timeStep= 0.1f;
+        private libsecondlife.TerrainManager TerrainManager;
+        
+        private Random Rand = new Random();
+        private uint _primCount = 702000;
+        public World()
+        {
+                ServerConsole.MainConsole.Instance.WriteLine("World.cs - creating new entitities instance");
+                Entities = new Dictionary<libsecondlife.LLUUID, Entity>();
+                ServerConsole.MainConsole.Instance.WriteLine("World.cs - creating LandMap");
+                TerrainManager = new TerrainManager(new SecondLife());
+                        
+        //      ServerConsole.MainConsole.Instance.WriteLine("World.cs - Creating script engine instance");
+                // Initialise this only after the world has loaded
+        //      Scripts = new ScriptEngine(this);
+        }
+        
+        public PhysicsScene PhysScene
+        {
+                set
+                {
+                        this.phyScene = value;
+                }
+                get
+                {
+                        return(this.phyScene);
+                }
+        }
+        
+        public void Update()
+        {
+                if(this.phyScene.IsThreaded)
+                {
+                        this.phyScene.GetResults();
+                        
+                }
+                
+                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+                {
+                        Entities[UUID].addForces();
+                }
+                
+                this.phyScene.Simulate(timeStep);
+                
+                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+                {
+                        Entities[UUID].update();
+                }
+        }
+        public void SendLayerData(OpenSimClient RemoteClient) {
+                int[] patches = new int[4];
+            for (int y = 0; y < 16; y++)
+            {
+                for (int x = 0; x < 16; x = x + 4)
+                {
+                    patches[0] = x + 0 + y * 16;
+                    patches[1] = x + 1 + y * 16;
+                    patches[2] = x + 2 + y * 16;
+                    patches[3] = x + 3 + y * 16;
+                    Packet layerpack = TerrainManager.CreateLandPacket(LandMap, patches);
+                    RemoteClient.OutPacket(layerpack);
+                }
+            }
+        }
+        public void AddViewerAgent(OpenSimClient AgentClient) {
+                ServerConsole.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
+                Avatar NewAvatar = new Avatar(AgentClient);
+                ServerConsole.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Adding new avatar to world");
+                ServerConsole.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Starting RegionHandshake ");
+                NewAvatar.SendRegionHandshake(this);
+                
+                NewAvatar.PhysActor = this.phyScene.AddAvatar(new PhysicsVector(NewAvatar.position.X, NewAvatar.position.Y, NewAvatar.position.Z));
+                //this.Update();                // will work for now, but needs to be optimised so we don't update everything in the sim for each new user
+                this.Entities.Add(AgentClient.AgentID, NewAvatar);
+        }
+        
+        public void AddNewPrim(ObjectAddPacket addPacket, OpenSimClient AgentClient)
+        {
+                ServerConsole.MainConsole.Instance.WriteLine("World.cs: AddNewPrim() - Creating new prim");
+                Primitive prim = new Primitive();
+                prim.CreateFromPacket(addPacket, AgentClient.AgentID, this._primCount);
+                this.Entities.Add(prim.uuid, prim);
+                this._primCount++;
+        }
+        public bool Backup() {
+                /* TODO: Save the current world entities state. */
+                return false;
+        }
+        
+        
+    }
+}
author	gareth	2007-03-07 19:07:00 +0000
committer	gareth	2007-03-07 19:07:00 +0000
commit	2159b3079ec8df2a7337a9d4ea54810b7028c4e1 (patch)
tree	5473123011f7a302e63f89ec6ccb4477032fd1db /src/world/World.cs
parent	Imported branch (diff)
download	opensim-SC-2159b3079ec8df2a7337a9d4ea54810b7028c4e1.zip opensim-SC-2159b3079ec8df2a7337a9d4ea54810b7028c4e1.tar.gz opensim-SC-2159b3079ec8df2a7337a9d4ea54810b7028c4e1.tar.bz2 opensim-SC-2159b3079ec8df2a7337a9d4ea54810b7028c4e1.tar.xz

diff --git a/src/world/World.cs b/src/world/World.cs new file mode 100644 index 0000000..8427a38 --- /dev/null +++ b/src/world/World.cs
@@ -0,0 +1,117 @@
	1	using System;
	2	using libsecondlife;
	3	using libsecondlife.Packets;
	4	using System.Collections.Generic;
	5	using System.Text;
	6	using PhysicsSystem;
	7
	8	namespace OpenSim.world
	9	{
	10	public class World
	11	{
	12	public Dictionary<libsecondlife.LLUUID, Entity> Entities;
	13	public float[] LandMap;
	14	public ScriptEngine Scripts;
	15	public uint _localNumber=0;
	16	private PhysicsScene phyScene;
	17	private float timeStep= 0.1f;
	18	private libsecondlife.TerrainManager TerrainManager;
	19
	20	private Random Rand = new Random();
	21	private uint _primCount = 702000;
	22
	23	public World()
	24	{
	25	ServerConsole.MainConsole.Instance.WriteLine("World.cs - creating new entitities instance");
	26	Entities = new Dictionary<libsecondlife.LLUUID, Entity>();
	27
	28	ServerConsole.MainConsole.Instance.WriteLine("World.cs - creating LandMap");
	29	TerrainManager = new TerrainManager(new SecondLife());
	30
	31	// ServerConsole.MainConsole.Instance.WriteLine("World.cs - Creating script engine instance");
	32	// Initialise this only after the world has loaded
	33	// Scripts = new ScriptEngine(this);
	34	}
	35
	36	public PhysicsScene PhysScene
	37	{
	38	set
	39	{
	40	this.phyScene = value;
	41	}
	42	get
	43	{
	44	return(this.phyScene);
	45	}
	46	}
	47
	48	public void Update()
	49	{
	50
	51	if(this.phyScene.IsThreaded)
	52	{
	53	this.phyScene.GetResults();
	54
	55	}
	56
	57	foreach (libsecondlife.LLUUID UUID in Entities.Keys)
	58	{
	59	Entities[UUID].addForces();
	60	}
	61
	62	this.phyScene.Simulate(timeStep);
	63
	64	foreach (libsecondlife.LLUUID UUID in Entities.Keys)
	65	{
	66	Entities[UUID].update();
	67	}
	68	}
	69
	70	public void SendLayerData(OpenSimClient RemoteClient) {
	71	int[] patches = new int[4];
	72
	73	for (int y = 0; y < 16; y++)
	74	{
	75	for (int x = 0; x < 16; x = x + 4)
	76	{
	77	patches[0] = x + 0 + y * 16;
	78	patches[1] = x + 1 + y * 16;
	79	patches[2] = x + 2 + y * 16;
	80	patches[3] = x + 3 + y * 16;
	81
	82	Packet layerpack = TerrainManager.CreateLandPacket(LandMap, patches);
	83	RemoteClient.OutPacket(layerpack);
	84	}
	85	}
	86	}
	87
	88	public void AddViewerAgent(OpenSimClient AgentClient) {
	89	ServerConsole.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
	90	Avatar NewAvatar = new Avatar(AgentClient);
	91	ServerConsole.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Adding new avatar to world");
	92	ServerConsole.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Starting RegionHandshake ");
	93	NewAvatar.SendRegionHandshake(this);
	94
	95	NewAvatar.PhysActor = this.phyScene.AddAvatar(new PhysicsVector(NewAvatar.position.X, NewAvatar.position.Y, NewAvatar.position.Z));
	96	//this.Update(); // will work for now, but needs to be optimised so we don't update everything in the sim for each new user
	97	this.Entities.Add(AgentClient.AgentID, NewAvatar);
	98	}
	99
	100	public void AddNewPrim(ObjectAddPacket addPacket, OpenSimClient AgentClient)
	101	{
	102	ServerConsole.MainConsole.Instance.WriteLine("World.cs: AddNewPrim() - Creating new prim");
	103	Primitive prim = new Primitive();
	104	prim.CreateFromPacket(addPacket, AgentClient.AgentID, this._primCount);
	105	this.Entities.Add(prim.uuid, prim);
	106	this._primCount++;
	107	}
	108
	109	public bool Backup() {
	110	/* TODO: Save the current world entities state. */
	111
	112	return false;
	113	}
	114
	115
	116	}
	117	}