From 4848dcf0e3a435edbf33b24796d838020563f99d Mon Sep 17 00:00:00 2001 From: Charles Krinke Date: Tue, 15 Jul 2008 03:17:45 +0000 Subject: [PATCH] I had to revert the Mantis#1746 patch as although the local build with Windows compiled, the automated build failed. --- .../Region/ScriptEngine/Common/LSL_Types.cs | 4 +- .../Common/LSL_TypesTestVector3.cs | 62 ------------------- 2 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 OpenSim/Region/ScriptEngine/Common/LSL_TypesTestVector3.cs diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs index 3dfa7116d4..eb13f45944 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs @@ -141,9 +141,9 @@ namespace OpenSim.Region.ScriptEngine.Common return new Vector3(lhs.x - rhs.x, lhs.y - rhs.y, lhs.z - rhs.z); } - public static LSLFloat operator *(Vector3 lhs, Vector3 rhs) + public static Vector3 operator *(Vector3 lhs, Vector3 rhs) { - return Dot(lhs, rhs); + return new Vector3(lhs.x * rhs.x, lhs.y * rhs.y, lhs.z * rhs.z); } public static Vector3 operator %(Vector3 v1, Vector3 v2) diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestVector3.cs b/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestVector3.cs deleted file mode 100644 index 5631854da8..0000000000 --- a/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestVector3.cs +++ /dev/null @@ -1,62 +0,0 @@ -/* - * 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.Common; - -namespace OpenSim.Region.ScriptEngine.Common.Tests -{ - [TestFixture] - public class LSL_TypesTestVector3 - { - /// - /// Tests for Vector3 - /// - [Test] - - public void TestDotProduct() - { - // The numbers we test for. - Dictionary expectsSet = new Dictionary(); - expectsSet.Add("<1, 2, 3> * <2, 3, 4>", 20.0); - expectsSet.Add("<1, 2, 3> * <0, 0, 0>", 0.0); - - double result; - string[] parts; - string[] delim = { "*" }; - - foreach (KeyValuePair ex in expectsSet) - { - parts = ex.Key.Split(delim, System.StringSplitOptions.None); - result = new LSL_Types.Vector3(parts[0]) * new LSL_Types.Vector3(parts[1]); - Assert.AreEqual(ex.Value, result); - } - } - } -}