From 304ebe22a24f16e9fa41925ab9cdbd4bffdfd880 Mon Sep 17 00:00:00 2001 From: mingchen Date: Mon, 11 Jun 2007 17:58:14 +0000 Subject: *Removed OSVector3 and replaced with libsecondlife.LLVector3 --- .../Interfaces/Scripting/IScriptAPI.cs | 3 +- Common/OpenSim.Framework/OpenSim.Framework.csproj | 40 ++++++++++--------- Common/OpenSim.Framework/Types/OSVector3.cs | 45 ---------------------- OpenSim/OpenSim.Region/World/World.Scripting.cs | 4 +- .../EmbeddedJVM/InterpreterMethods.cs | 8 ++-- .../OpenSim.Scripting.EmbeddedJVM.csproj | 35 +++++++++++------ 6 files changed, 54 insertions(+), 81 deletions(-) delete mode 100644 Common/OpenSim.Framework/Types/OSVector3.cs diff --git a/Common/OpenSim.Framework/Interfaces/Scripting/IScriptAPI.cs b/Common/OpenSim.Framework/Interfaces/Scripting/IScriptAPI.cs index cf4a35e..0c1627b 100644 --- a/Common/OpenSim.Framework/Interfaces/Scripting/IScriptAPI.cs +++ b/Common/OpenSim.Framework/Interfaces/Scripting/IScriptAPI.cs @@ -30,11 +30,12 @@ using System.Collections.Generic; using System.Text; using OpenSim.Framework.Types; +using libsecondlife; namespace OpenSim.Framework.Interfaces { public interface IScriptAPI { - OSVector3 GetEntityPosition(uint localID); + LLVector3 GetEntityPosition(uint localID); void SetEntityPosition(uint localID, float x, float y, float z); uint GetRandomAvatarID(); } diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj index f72c5f5..0da0982 100644 --- a/Common/OpenSim.Framework/OpenSim.Framework.csproj +++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj @@ -1,4 +1,4 @@ - + Local 8.0.50727 @@ -6,7 +6,8 @@ {8ACA2445-0000-0000-0000-000000000000} Debug AnyCPU - + + OpenSim.Framework @@ -15,9 +16,11 @@ IE50 false Library - + + OpenSim.Framework - + + @@ -28,7 +31,8 @@ TRACE;DEBUG - + + True 4096 False @@ -37,7 +41,8 @@ False False 4 - + + False @@ -46,7 +51,8 @@ TRACE - + + False 4096 True @@ -55,22 +61,23 @@ False False 4 - + + - + System.dll False - + System.Xml.dll False - + ..\..\bin\libsecondlife.dll False - + ..\..\bin\Db4objects.Db4o.dll False @@ -80,13 +87,13 @@ XMLRPC {8E81D43C-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False OpenSim.Framework.Console {A7CD0630-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False @@ -216,9 +223,6 @@ Code - - Code - Code @@ -236,4 +240,4 @@ - + \ No newline at end of file diff --git a/Common/OpenSim.Framework/Types/OSVector3.cs b/Common/OpenSim.Framework/Types/OSVector3.cs deleted file mode 100644 index 19a9874..0000000 --- a/Common/OpenSim.Framework/Types/OSVector3.cs +++ /dev/null @@ -1,45 +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.Types -{ - public class OSVector3 - { - public float X; - public float Y; - public float Z; - - public OSVector3() - { - - } - } -} diff --git a/OpenSim/OpenSim.Region/World/World.Scripting.cs b/OpenSim/OpenSim.Region/World/World.Scripting.cs index 4cd3306..e4b5d02 100644 --- a/OpenSim/OpenSim.Region/World/World.Scripting.cs +++ b/OpenSim/OpenSim.Region/World/World.Scripting.cs @@ -118,9 +118,9 @@ namespace OpenSim.Region /// /// /// - public OSVector3 GetEntityPosition(uint localID) + public LLVector3 GetEntityPosition(uint localID) { - OSVector3 res = new OSVector3(); + LLVector3 res = new LLVector3(); // Console.WriteLine("script- getting entity " + localID + " position"); foreach (Entity entity in this.Entities.Values) { diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs index 00aa98e..4760e59 100644 --- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs +++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs @@ -34,6 +34,8 @@ using OpenSim.Framework.Interfaces; using OpenSim.Framework; using OpenSim.Framework.Types; +using libsecondlife; + namespace OpenSim.Scripting.EmbeddedJVM { partial class Thread @@ -101,7 +103,7 @@ namespace OpenSim.Scripting.EmbeddedJVM { //Console.WriteLine("get entity pos for " + ((Int)bs1).mValue); //should get the position of the entity from the IScriptAPI - OSVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue); + LLVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue); Float pos = new Float(); pos.mValue = vec3.X; // Console.WriteLine("returned x value " + vec3.X.ToString()); @@ -114,7 +116,7 @@ namespace OpenSim.Scripting.EmbeddedJVM if (bs1 is Int) { //should get the position of the entity from the IScriptAPI - OSVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue); + LLVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue); Float pos = new Float(); pos.mValue = vec3.Y; this._mThread.currentFrame.OpStack.Push(pos); @@ -126,7 +128,7 @@ namespace OpenSim.Scripting.EmbeddedJVM if (bs1 is Int) { //should get the position of the entity from the IScriptAPI - OSVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue); + LLVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue); Float pos = new Float(); pos.mValue = vec3.Z; this._mThread.currentFrame.OpStack.Push(pos); diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj index bd1a332..0750742 100644 --- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj +++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj @@ -1,4 +1,4 @@ - + Local 8.0.50727 @@ -6,7 +6,8 @@ {97A82740-0000-0000-0000-000000000000} Debug AnyCPU - + + OpenSim.Scripting.EmbeddedJVM @@ -15,9 +16,11 @@ IE50 false Library - + + OpenSim.Scripting.EmbeddedJVM - + + @@ -28,7 +31,8 @@ TRACE;DEBUG - + + True 4096 False @@ -37,7 +41,8 @@ False False 4 - + + False @@ -46,7 +51,8 @@ TRACE - + + False 4096 True @@ -55,14 +61,19 @@ False False 4 - + + - + + False + ..\..\..\bin\libsecondlife.dll + + System.dll False - + System.Xml.dll False @@ -72,7 +83,7 @@ OpenSim.Framework {8ACA2445-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False @@ -150,4 +161,4 @@ - + \ No newline at end of file -- cgit v1.1