Finished removing the old scripting code, Scene.Scripting.cs and OpenSim.Framework.Interfaces.Scripting.

2 files changed, 36 insertions, 48 deletions

diff --git a/OpenSim/Framework/General/Interfaces/Scripting/IScriptEngine.cs b/OpenSim/Framework/General/Interfaces/Scripting/IScriptEngine.cs
deleted file mode 100644
index ca50be0..0000000
--- a/OpenSim/Framework/General/Interfaces/Scripting/IScriptEngine.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-/*

-* 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;

-

-namespace OpenSim.Framework.Interfaces

-{

-    public interface IScriptEngine

-    {

-        bool Init(IScriptAPI api);

-        string GetName();

-        void LoadScript(string script, string scriptName, uint entityID);

-        void OnFrame();

-    }

-}

diff --git a/OpenSim/Framework/General/Interfaces/Scripting/IScriptAPI.cs b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
index 0c1627b..1e64675 100644
--- a/OpenSim/Framework/General/Interfaces/Scripting/IScriptAPI.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
@@ -28,15 +28,44 @@
 using System;

 using System.Collections.Generic;

 using System.Text;

-using OpenSim.Framework.Types;

 

-using libsecondlife;

-namespace OpenSim.Framework.Interfaces

+using OpenSim.Framework.Console;

+using OpenSim.Framework;

+using OpenSim.Region.Environment;

+using OpenSim.Region.Environment.Scenes;

+

+namespace OpenSim.Region.Enviorment.Scripting

 {

-    public interface IScriptAPI

+    public interface IScript

+    {

+        void Initialise(ScriptInfo scriptInfo);

+        string getName();

+    }

+

+    public class TestScript : IScript

     {

-        LLVector3 GetEntityPosition(uint localID);

-        void SetEntityPosition(uint localID, float x, float y, float z);

-        uint GetRandomAvatarID();

+        ScriptInfo script;

+

+        public string getName()

+        {

+            return "TestScript 0.1";

+        }

+

+        public void Initialise(ScriptInfo scriptInfo)

+        {

+            script = scriptInfo;

+            script.events.OnFrame += new OpenSim.Region.Environment.Scenes.EventManager.OnFrameDelegate(events_OnFrame);

+            script.events.OnNewPresence += new EventManager.OnNewPresenceDelegate(events_OnNewPresence);

+        }

+

+        void events_OnNewPresence(ScenePresence presence)

+        {

+            script.logger.Verbose("Hello " + presence.firstname.ToString() + "!");

+        }

+

+        void events_OnFrame()

+        {

+            //script.logger.Verbose("Hello World!");

+        }

     }

 }