From 3376b82501000692d6dac24b051af738cdaf2737 Mon Sep 17 00:00:00 2001
From: MW
Date: Thu, 24 May 2007 12:16:50 +0000
Subject: Some more code refactoring, plus a restructuring of the directories
 so that the Grid servers can be a separate solution to the region server.

---
 .../world/scripting/IScriptContext.cs              | 13 ---
 .../world/scripting/IScriptEntity.cs               | 19 -----
 .../world/scripting/IScriptHandler.cs              | 98 ----------------------
 OpenSim.RegionServer/world/scripting/Script.cs     | 26 ------
 .../world/scripting/ScriptFactory.cs               |  8 --
 .../world/scripting/Scripts/FollowRandomAvatar.cs  | 37 --------
 6 files changed, 201 deletions(-)
 delete mode 100644 OpenSim.RegionServer/world/scripting/IScriptContext.cs
 delete mode 100644 OpenSim.RegionServer/world/scripting/IScriptEntity.cs
 delete mode 100644 OpenSim.RegionServer/world/scripting/IScriptHandler.cs
 delete mode 100644 OpenSim.RegionServer/world/scripting/Script.cs
 delete mode 100644 OpenSim.RegionServer/world/scripting/ScriptFactory.cs
 delete mode 100644 OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs

(limited to 'OpenSim.RegionServer/world/scripting')

diff --git a/OpenSim.RegionServer/world/scripting/IScriptContext.cs b/OpenSim.RegionServer/world/scripting/IScriptContext.cs
deleted file mode 100644
index 465c23b..0000000
--- a/OpenSim.RegionServer/world/scripting/IScriptContext.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-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.RegionServer/world/scripting/IScriptEntity.cs b/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
deleted file mode 100644
index 2ef16a4..0000000
--- a/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-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.RegionServer/world/scripting/IScriptHandler.cs b/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
deleted file mode 100644
index 15efc49..0000000
--- a/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-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.RegionServer/world/scripting/Script.cs b/OpenSim.RegionServer/world/scripting/Script.cs
deleted file mode 100644
index 48c18ff..0000000
--- a/OpenSim.RegionServer/world/scripting/Script.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-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.RegionServer/world/scripting/ScriptFactory.cs b/OpenSim.RegionServer/world/scripting/ScriptFactory.cs
deleted file mode 100644
index 4c6d373..0000000
--- a/OpenSim.RegionServer/world/scripting/ScriptFactory.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.RegionServer.world.scripting
-{
-    public delegate Script ScriptFactory();
-}
diff --git a/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
deleted file mode 100644
index 6a689ab..0000000
--- a/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-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;
-            }
-        }
-    }
-
-
-}
-- 
cgit v1.1