Some more code refactoring, plus a restructuring of the directories so that the Grid servers can be a separate solution to the region server.

author: MW 2007-05-24 12:16:50 +0000
committer: MW 2007-05-24 12:16:50 +0000
commit: 3376b82501000692d6dac24b051af738cdaf2737 (patch)
tree: 90ed0a5d4955236f011fa63fce9d555186b0d179 /OpenSim-Source/OpenSim.RegionServer/world/scripting
parent: Added "terrain save grdmap <filename> <gradientmap>" function to console. Gra... (diff)
download: opensim-SC-3376b82501000692d6dac24b051af738cdaf2737.zip
opensim-SC-3376b82501000692d6dac24b051af738cdaf2737.tar.gz
opensim-SC-3376b82501000692d6dac24b051af738cdaf2737.tar.bz2
opensim-SC-3376b82501000692d6dac24b051af738cdaf2737.tar.xz
6 files changed, 201 insertions, 0 deletions
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptContext.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptContext.cs
new file mode 100644
index 0000000..465c23b
--- /dev/null
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptContext.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+namespace OpenSim.RegionServer.world.scripting
+{
+    public interface IScriptContext
+    {
+        IScriptEntity Entity { get; }
+        bool TryGetRandomAvatar(out IScriptReadonlyEntity avatar);
+    }
+}
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptEntity.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
new file mode 100644
index 0000000..2ef16a4
--- /dev/null
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+namespace OpenSim.RegionServer.world.scripting
+{
+    public interface IScriptReadonlyEntity
+    {
+        LLVector3 Pos { get; }
+        string Name { get; }
+    }
+    
+    public interface IScriptEntity
+    {
+        LLVector3 Pos { get; set; }
+        string Name { get; }
+    }
+}
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptHandler.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
new file mode 100644
index 0000000..15efc49
--- /dev/null
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using OpenSim.Physics.Manager;
+using OpenSim.world;
+using Avatar=OpenSim.world.Avatar;
+using Primitive = OpenSim.world.Primitive;
+namespace OpenSim.RegionServer.world.scripting
+{
+    public delegate void ScriptEventHandler(IScriptContext context);
+    public class ScriptHandler : IScriptContext, IScriptEntity, IScriptReadonlyEntity
+    {
+        private World m_world;
+        private Script m_script;
+        private Entity m_entity;
+        public LLUUID ScriptId
+        {
+            get
+            {
+                return m_script.ScriptId;
+            }
+        }
+        public void OnFrame()
+        {
+            m_script.OnFrame(this);
+        }
+        public ScriptHandler(Script script, Entity entity, World world)
+        {
+            m_script = script;
+            m_entity = entity;
+            m_world = world;
+        }
+        #region IScriptContext Members
+        IScriptEntity IScriptContext.Entity
+        {
+            get
+            {
+                return this;
+            }
+        }
+        bool IScriptContext.TryGetRandomAvatar(out IScriptReadonlyEntity avatar)
+        {
+            foreach (Entity entity in m_world.Entities.Values )
+            {
+                if( entity is Avatar )
+                {
+                    avatar = entity;
+                    return true;
+                }
+            }
+            
+            avatar = null;
+            return false;
+        }
+        #endregion
+        #region IScriptEntity and IScriptReadonlyEntity Members
+        public string Name
+        {
+            get
+            {
+                return m_entity.Name;
+            }
+        }
+        public LLVector3 Pos
+        {
+            get
+            {
+                return m_entity.Pos;
+            }
+            set
+            {
+                if (m_entity is Primitive)
+                {
+                    Primitive prim = m_entity as Primitive;
+                    // Of course, we really should have asked the physEngine if this is possible, and if not, returned false.
+                    prim.UpdatePosition( value );
+                }
+            }
+        }
+        #endregion
+    }
+}
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/scripting/Script.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/Script.cs
new file mode 100644
index 0000000..48c18ff
--- /dev/null
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/Script.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+namespace OpenSim.RegionServer.world.scripting
+{
+    public class Script
+    {
+        private LLUUID m_scriptId;        
+        public virtual LLUUID ScriptId
+        {
+            get
+            {
+                return m_scriptId;
+            }
+        }
+        public Script( LLUUID scriptId )
+        {
+            m_scriptId = scriptId;
+        }
+        
+        public ScriptEventHandler OnFrame;
+    }
+}
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/scripting/ScriptFactory.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/ScriptFactory.cs
new file mode 100644
index 0000000..4c6d373
--- /dev/null
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/ScriptFactory.cs
@@ -0,0 +1,8 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+namespace OpenSim.RegionServer.world.scripting
+{
+    public delegate Script ScriptFactory();
+}
diff --git a/OpenSim-Source/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
new file mode 100644
index 0000000..6a689ab
--- /dev/null
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+namespace OpenSim.RegionServer.world.scripting
+{
+    public class FollowRandomAvatar : Script
+    {
+        public FollowRandomAvatar()
+            : base(LLUUID.Random())
+        {
+            OnFrame += MyOnFrame;
+        }
+        private void MyOnFrame(IScriptContext context)
+        {
+            LLVector3 pos = context.Entity.Pos;
+            IScriptReadonlyEntity avatar;
+            if (context.TryGetRandomAvatar(out avatar))
+            {
+                LLVector3 avatarPos = avatar.Pos;
+                float x = pos.X + ((float)avatarPos.X.CompareTo(pos.X)) / 2;
+                float y = pos.Y + ((float)avatarPos.Y.CompareTo(pos.Y)) / 2;
+                LLVector3 newPos = new LLVector3(x, y, pos.Z);
+                context.Entity.Pos = newPos;
+            }
+        }
+    }
+}
author	MW	2007-05-24 12:16:50 +0000
committer	MW	2007-05-24 12:16:50 +0000
commit	3376b82501000692d6dac24b051af738cdaf2737 (patch)
tree	90ed0a5d4955236f011fa63fce9d555186b0d179 /OpenSim-Source/OpenSim.RegionServer/world/scripting
parent	Added "terrain save grdmap <filename> <gradientmap>" function to console. Gra... (diff)
download	opensim-SC-3376b82501000692d6dac24b051af738cdaf2737.zip opensim-SC-3376b82501000692d6dac24b051af738cdaf2737.tar.gz opensim-SC-3376b82501000692d6dac24b051af738cdaf2737.tar.bz2 opensim-SC-3376b82501000692d6dac24b051af738cdaf2737.tar.xz

diff --git a/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptContext.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptContext.cs new file mode 100644 index 0000000..465c23b --- /dev/null +++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptContext.cs
@@ -0,0 +1,13 @@
	1	using System;
	2	using System.Collections.Generic;
	3	using System.Text;
	4	using libsecondlife;
	5
	6	namespace OpenSim.RegionServer.world.scripting
	7	{
	8	public interface IScriptContext
	9	{
	10	IScriptEntity Entity { get; }
	11	bool TryGetRandomAvatar(out IScriptReadonlyEntity avatar);
	12	}
	13	}


diff --git a/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptEntity.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptEntity.cs new file mode 100644 index 0000000..2ef16a4 --- /dev/null +++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
@@ -0,0 +1,19 @@
	1	using System;
	2	using System.Collections.Generic;
	3	using System.Text;
	4	using libsecondlife;
	5
	6	namespace OpenSim.RegionServer.world.scripting
	7	{
	8	public interface IScriptReadonlyEntity
	9	{
	10	LLVector3 Pos { get; }
	11	string Name { get; }
	12	}
	13
	14	public interface IScriptEntity
	15	{
	16	LLVector3 Pos { get; set; }
	17	string Name { get; }
	18	}
	19	}


diff --git a/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptHandler.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptHandler.cs new file mode 100644 index 0000000..15efc49 --- /dev/null +++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
@@ -0,0 +1,98 @@
	1	using System;
	2	using System.Collections.Generic;
	3	using System.Text;
	4	using libsecondlife;
	5	using OpenSim.Physics.Manager;
	6	using OpenSim.world;
	7	using Avatar=OpenSim.world.Avatar;
	8	using Primitive = OpenSim.world.Primitive;
	9
	10	namespace OpenSim.RegionServer.world.scripting
	11	{
	12	public delegate void ScriptEventHandler(IScriptContext context);
	13
	14	public class ScriptHandler : IScriptContext, IScriptEntity, IScriptReadonlyEntity
	15	{
	16	private World m_world;
	17	private Script m_script;
	18	private Entity m_entity;
	19
	20	public LLUUID ScriptId
	21	{
	22	get
	23	{
	24	return m_script.ScriptId;
	25	}
	26	}
	27
	28	public void OnFrame()
	29	{
	30	m_script.OnFrame(this);
	31	}
	32
	33	public ScriptHandler(Script script, Entity entity, World world)
	34	{
	35	m_script = script;
	36	m_entity = entity;
	37	m_world = world;
	38	}
	39
	40	#region IScriptContext Members
	41
	42	IScriptEntity IScriptContext.Entity
	43	{
	44	get
	45	{
	46	return this;
	47	}
	48	}
	49
	50	bool IScriptContext.TryGetRandomAvatar(out IScriptReadonlyEntity avatar)
	51	{
	52	foreach (Entity entity in m_world.Entities.Values )
	53	{
	54	if( entity is Avatar )
	55	{
	56	avatar = entity;
	57	return true;
	58	}
	59	}
	60
	61	avatar = null;
	62	return false;
	63	}
	64
	65	#endregion
	66
	67	#region IScriptEntity and IScriptReadonlyEntity Members
	68
	69	public string Name
	70	{
	71	get
	72	{
	73	return m_entity.Name;
	74	}
	75	}
	76
	77	public LLVector3 Pos
	78	{
	79	get
	80	{
	81	return m_entity.Pos;
	82	}
	83
	84	set
	85	{
	86	if (m_entity is Primitive)
	87	{
	88	Primitive prim = m_entity as Primitive;
	89	// Of course, we really should have asked the physEngine if this is possible, and if not, returned false.
	90	prim.UpdatePosition( value );
	91	}
	92	}
	93	}
	94
	95	#endregion
	96	}
	97
	98	}


diff --git a/OpenSim-Source/OpenSim.RegionServer/world/scripting/Script.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/Script.cs new file mode 100644 index 0000000..48c18ff --- /dev/null +++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/Script.cs
@@ -0,0 +1,26 @@
	1	using System;
	2	using System.Collections.Generic;
	3	using System.Text;
	4	using libsecondlife;
	5
	6	namespace OpenSim.RegionServer.world.scripting
	7	{
	8	public class Script
	9	{
	10	private LLUUID m_scriptId;
	11	public virtual LLUUID ScriptId
	12	{
	13	get
	14	{
	15	return m_scriptId;
	16	}
	17	}
	18
	19	public Script( LLUUID scriptId )
	20	{
	21	m_scriptId = scriptId;
	22	}
	23
	24	public ScriptEventHandler OnFrame;
	25	}
	26	}


diff --git a/OpenSim-Source/OpenSim.RegionServer/world/scripting/ScriptFactory.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/ScriptFactory.cs new file mode 100644 index 0000000..4c6d373 --- /dev/null +++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/ScriptFactory.cs
@@ -0,0 +1,8 @@
	1	using System;
	2	using System.Collections.Generic;
	3	using System.Text;
	4
	5	namespace OpenSim.RegionServer.world.scripting
	6	{
	7	public delegate Script ScriptFactory();
	8	}


diff --git a/OpenSim-Source/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs new file mode 100644 index 0000000..6a689ab --- /dev/null +++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
@@ -0,0 +1,37 @@
	1	using System;
	2	using System.Collections.Generic;
	3	using System.Text;
	4	using libsecondlife;
	5
	6	namespace OpenSim.RegionServer.world.scripting
	7	{
	8	public class FollowRandomAvatar : Script
	9	{
	10	public FollowRandomAvatar()
	11	: base(LLUUID.Random())
	12	{
	13	OnFrame += MyOnFrame;
	14	}
	15
	16	private void MyOnFrame(IScriptContext context)
	17	{
	18	LLVector3 pos = context.Entity.Pos;
	19
	20	IScriptReadonlyEntity avatar;
	21
	22	if (context.TryGetRandomAvatar(out avatar))
	23	{
	24	LLVector3 avatarPos = avatar.Pos;
	25
	26	float x = pos.X + ((float)avatarPos.X.CompareTo(pos.X)) / 2;
	27	float y = pos.Y + ((float)avatarPos.Y.CompareTo(pos.Y)) / 2;
	28
	29	LLVector3 newPos = new LLVector3(x, y, pos.Z);
	30
	31	context.Entity.Pos = newPos;
	32	}
	33	}
	34	}
	35
	36
	37	}