From d959c65b91a9acc3b29478907a66afc16f01b047 Mon Sep 17 00:00:00 2001 From: Mike Mazur Date: Mon, 28 Jul 2008 02:36:26 +0000 Subject: [PATCH] -implement LSLString -> Quaternion explicit cast -sync Shared/LSL_Types.cs with Common/LSL_Types.cs -get the test script in issue 1822 to compile --- .../Region/ScriptEngine/Common/LSL_Types.cs | 5 ++ .../Region/ScriptEngine/Shared/LSL_Types.cs | 10 +++ .../Common/LSL_TypesTestLSLString.cs | 17 +++++ .../Shared/LSL_TypesTestLSLInteger.cs | 71 +++++++++++++++++++ .../Shared/LSL_TypesTestLSLString.cs | 17 +++++ 5 files changed, 120 insertions(+) create mode 100644 OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLInteger.cs diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs index d0871bc775..74c99359d9 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs @@ -1190,6 +1190,11 @@ namespace OpenSim.Region.ScriptEngine.Common return new Vector3(s.m_string); } + public static implicit operator Quaternion(LSLString s) + { + return new Quaternion(s.m_string); + } + public static implicit operator LSLFloat(LSLString s) { return new LSLFloat(Convert.ToDouble(s.m_string)); diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index 89722da1b6..57394d9394 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs @@ -1190,6 +1190,11 @@ namespace OpenSim.Region.ScriptEngine.Shared return new Vector3(s.m_string); } + public static implicit operator Quaternion(LSLString s) + { + return new Quaternion(s.m_string); + } + public static implicit operator LSLFloat(LSLString s) { return new LSLFloat(Convert.ToDouble(s.m_string)); @@ -1291,6 +1296,11 @@ namespace OpenSim.Region.ScriptEngine.Shared return new LSLInteger(d); } + static public explicit operator LSLInteger(LSLFloat f) + { + return new LSLInteger(f.value); + } + static public bool operator ==(LSLInteger i1, LSLInteger i2) { bool ret = i1.value == i2.value; diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLString.cs b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLString.cs index c855f346e5..5d4424b77f 100644 --- a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLString.cs +++ b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLString.cs @@ -94,5 +94,22 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests Assert.AreEqual(number.Value, testString.m_string); } } + + /// + /// Test constructing a Quaternion from a string. + /// + [Test] + public void TestExplicitCastLSLStringToQuaternion() + { + string quaternionString = "<0.00000, 0.70711, 0.00000, 0.70711>"; + LSL_Types.LSLString quaternionLSLString = new LSL_Types.LSLString(quaternionString); + + LSL_Types.Quaternion expectedQuaternion = new LSL_Types.Quaternion(0.0, 0.70711, 0.0, 0.70711); + LSL_Types.Quaternion stringQuaternion = (LSL_Types.Quaternion) quaternionString; + LSL_Types.Quaternion LSLStringQuaternion = (LSL_Types.Quaternion) quaternionLSLString; + + Assert.AreEqual(expectedQuaternion, stringQuaternion); + Assert.AreEqual(expectedQuaternion, LSLStringQuaternion); + } } } diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLInteger.cs b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLInteger.cs new file mode 100644 index 0000000000..a4e7bbcde9 --- /dev/null +++ b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLInteger.cs @@ -0,0 +1,71 @@ +/* + * Copyright (c) Contributors, http://opensimulator.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.Collections.Generic; +using NUnit.Framework; +using OpenSim.Tests.Common; +using OpenSim.Region.ScriptEngine.Shared; + +namespace OpenSim.Region.ScriptEngine.Shared.Tests +{ + [TestFixture] + public class LSL_TypesTestLSLInteger + { + private Dictionary m_doubleIntSet; + + /// + /// Sets up dictionaries and arrays used in the tests. + /// + [TestFixtureSetUp] + public void SetUpDataSets() + { + m_doubleIntSet = new Dictionary(); + m_doubleIntSet.Add(2.0, 2); + m_doubleIntSet.Add(-2.0, -2); + m_doubleIntSet.Add(0.0, 0); + m_doubleIntSet.Add(1.0, 1); + m_doubleIntSet.Add(-1.0, -1); + m_doubleIntSet.Add(999999999.0, 999999999); + m_doubleIntSet.Add(-99999999.0, -99999999); + } + + /// + /// Tests LSLInteger is correctly cast explicitly to LSLFloat. + /// + [Test] + public void TestExplicitCastLSLFloatToLSLInteger() + { + LSL_Types.LSLInteger testInteger; + + foreach (KeyValuePair number in m_doubleIntSet) + { + testInteger = (LSL_Types.LSLInteger) new LSL_Types.LSLFloat(number.Key); + Assert.AreEqual(testInteger.value, number.Value); + } + } + } +} diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLString.cs b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLString.cs index ceab376ac4..8fcb385eee 100644 --- a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLString.cs +++ b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/LSL_TypesTestLSLString.cs @@ -94,5 +94,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests Assert.AreEqual(number.Value, testString.m_string); } } + + /// + /// Test constructing a Quaternion from a string. + /// + [Test] + public void TestExplicitCastLSLStringToQuaternion() + { + string quaternionString = "<0.00000, 0.70711, 0.00000, 0.70711>"; + LSL_Types.LSLString quaternionLSLString = new LSL_Types.LSLString(quaternionString); + + LSL_Types.Quaternion expectedQuaternion = new LSL_Types.Quaternion(0.0, 0.70711, 0.0, 0.70711); + LSL_Types.Quaternion stringQuaternion = (LSL_Types.Quaternion) quaternionString; + LSL_Types.Quaternion LSLStringQuaternion = (LSL_Types.Quaternion) quaternionLSLString; + + Assert.AreEqual(expectedQuaternion, stringQuaternion); + Assert.AreEqual(expectedQuaternion, LSLStringQuaternion); + } } }