OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

a last set of files that seem to have embedded ^M in them

0.6.3-post-fixes
Sean Dague 2009-02-09 20:06:06 +00:00
parent 6bc9e0614c
commit 66dc421be7
4 changed files with 343 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

384
OpenSim/Region/Framework/Scenes/Hypergrid/HGHyperlink.cs
View File

@ -1,192 +1,192 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * 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 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using System.Reflection; using System.Reflection;
using System.Net; using System.Net;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenMetaverse; using OpenMetaverse;
using log4net; using log4net;
using Nini.Config; using Nini.Config;
namespace OpenSim.Region.Framework.Scenes.Hypergrid namespace OpenSim.Region.Framework.Scenes.Hypergrid
{ {
public class HGHyperlink public class HGHyperlink
{ {
private static readonly ILog m_log = private static readonly ILog m_log =
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static Random random = new Random(); private static Random random = new Random();
public static RegionInfo TryLinkRegionToCoords(Scene m_scene, IClientAPI client, string mapName, uint xloc, uint yloc) public static RegionInfo TryLinkRegionToCoords(Scene m_scene, IClientAPI client, string mapName, uint xloc, uint yloc)
{ {
string host = "127.0.0.1"; string host = "127.0.0.1";
string portstr; string portstr;
string regionName = ""; string regionName = "";
uint port = 9000; uint port = 9000;
string[] parts = mapName.Split(new char[] { ':' }); string[] parts = mapName.Split(new char[] { ':' });
if (parts.Length >= 1) if (parts.Length >= 1)
{ {
host = parts[0]; host = parts[0];
} }
if (parts.Length >= 2) if (parts.Length >= 2)
{ {
portstr = parts[1]; portstr = parts[1];
if (!UInt32.TryParse(portstr, out port)) if (!UInt32.TryParse(portstr, out port))
regionName = parts[1]; regionName = parts[1];
} }
// always take the last one // always take the last one
if (parts.Length >= 3) if (parts.Length >= 3)
{ {
regionName = parts[2]; regionName = parts[2];
} }
// Sanity check. Don't ever link to this sim. // Sanity check. Don't ever link to this sim.
IPAddress ipaddr = null; IPAddress ipaddr = null;
try try
{ {
ipaddr = Util.GetHostFromDNS(host); ipaddr = Util.GetHostFromDNS(host);
} }
catch { } catch { }
if ((ipaddr != null) && if ((ipaddr != null) &&
!((m_scene.RegionInfo.ExternalEndPoint.Address.Equals(ipaddr)) && (m_scene.RegionInfo.HttpPort == port))) !((m_scene.RegionInfo.ExternalEndPoint.Address.Equals(ipaddr)) && (m_scene.RegionInfo.HttpPort == port)))
{ {
RegionInfo regInfo; RegionInfo regInfo;
bool success = TryCreateLink(m_scene, client, xloc, yloc, regionName, port, host, out regInfo); bool success = TryCreateLink(m_scene, client, xloc, yloc, regionName, port, host, out regInfo);
if (success) if (success)
{ {
regInfo.RegionName = mapName; regInfo.RegionName = mapName;
return regInfo; return regInfo;
} }
} }
return null; return null;
} }
public static RegionInfo TryLinkRegion(Scene m_scene, IClientAPI client, string mapName) public static RegionInfo TryLinkRegion(Scene m_scene, IClientAPI client, string mapName)
{ {
uint xloc = (uint)(random.Next(0, Int16.MaxValue)); uint xloc = (uint)(random.Next(0, Int16.MaxValue));
return TryLinkRegionToCoords(m_scene, client, mapName, xloc, 0); return TryLinkRegionToCoords(m_scene, client, mapName, xloc, 0);
} }
public static bool TryCreateLink(Scene m_scene, IClientAPI client, uint xloc, uint yloc, public static bool TryCreateLink(Scene m_scene, IClientAPI client, uint xloc, uint yloc,
string externalRegionName, uint externalPort, string externalHostName, out RegionInfo regInfo) string externalRegionName, uint externalPort, string externalHostName, out RegionInfo regInfo)
{ {
m_log.DebugFormat("[HGrid]: Link to {0}:{1}, in {2}-{3}", externalHostName, externalPort, xloc, yloc); m_log.DebugFormat("[HGrid]: Link to {0}:{1}, in {2}-{3}", externalHostName, externalPort, xloc, yloc);
regInfo = new RegionInfo(); regInfo = new RegionInfo();
regInfo.RegionName = externalRegionName; regInfo.RegionName = externalRegionName;
regInfo.HttpPort = externalPort; regInfo.HttpPort = externalPort;
regInfo.ExternalHostName = externalHostName; regInfo.ExternalHostName = externalHostName;
regInfo.RegionLocX = xloc; regInfo.RegionLocX = xloc;
regInfo.RegionLocY = yloc; regInfo.RegionLocY = yloc;
try try
{ {
regInfo.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int)0); regInfo.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int)0);
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Warn("[HGrid]: Wrong format for link-region: " + e.Message); m_log.Warn("[HGrid]: Wrong format for link-region: " + e.Message);
return false; return false;
} }
regInfo.RemotingAddress = regInfo.ExternalEndPoint.Address.ToString(); regInfo.RemotingAddress = regInfo.ExternalEndPoint.Address.ToString();
// Finally, link it // Finally, link it
try try
{ {
m_scene.CommsManager.GridService.RegisterRegion(regInfo); m_scene.CommsManager.GridService.RegisterRegion(regInfo);
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Warn("[HGrid]: Unable to link region: " + e.Message); m_log.Warn("[HGrid]: Unable to link region: " + e.Message);
return false; return false;
} }
uint x, y; uint x, y;
if (!Check4096(m_scene, regInfo, out x, out y)) if (!Check4096(m_scene, regInfo, out x, out y))
{ {
m_scene.CommsManager.GridService.DeregisterRegion(regInfo); m_scene.CommsManager.GridService.DeregisterRegion(regInfo);
if (client != null) if (client != null)
client.SendAlertMessage("Region is too far (" + x + ", " + y + ")"); client.SendAlertMessage("Region is too far (" + x + ", " + y + ")");
m_log.Info("[HGrid]: Unable to link, region is too far (" + x + ", " + y + ")"); m_log.Info("[HGrid]: Unable to link, region is too far (" + x + ", " + y + ")");
return false; return false;
} }
if (!CheckCoords(m_scene.RegionInfo.RegionLocX, m_scene.RegionInfo.RegionLocY, x, y)) if (!CheckCoords(m_scene.RegionInfo.RegionLocX, m_scene.RegionInfo.RegionLocY, x, y))
{ {
m_scene.CommsManager.GridService.DeregisterRegion(regInfo); m_scene.CommsManager.GridService.DeregisterRegion(regInfo);
if (client != null) if (client != null)
client.SendAlertMessage("Region has incompatible coordinates (" + x + ", " + y + ")"); client.SendAlertMessage("Region has incompatible coordinates (" + x + ", " + y + ")");
m_log.Info("[HGrid]: Unable to link, region has incompatible coordinates (" + x + ", " + y + ")"); m_log.Info("[HGrid]: Unable to link, region has incompatible coordinates (" + x + ", " + y + ")");
return false; return false;
} }
m_log.Debug("[HGrid]: link region succeeded"); m_log.Debug("[HGrid]: link region succeeded");
return true; return true;
} }
/// <summary> /// <summary>
/// Cope with this viewer limitation. /// Cope with this viewer limitation.
/// </summary> /// </summary>
/// <param name="regInfo"></param> /// <param name="regInfo"></param>
/// <returns></returns> /// <returns></returns>
public static bool Check4096(Scene m_scene, RegionInfo regInfo, out uint x, out uint y) public static bool Check4096(Scene m_scene, RegionInfo regInfo, out uint x, out uint y)
{ {
ulong realHandle; ulong realHandle;
if (UInt64.TryParse(regInfo.regionSecret, out realHandle)) if (UInt64.TryParse(regInfo.regionSecret, out realHandle))
{ {
Utils.LongToUInts(realHandle, out x, out y); Utils.LongToUInts(realHandle, out x, out y);
x = x / Constants.RegionSize; x = x / Constants.RegionSize;
y = y / Constants.RegionSize; y = y / Constants.RegionSize;
if ((Math.Abs((int)m_scene.RegionInfo.RegionLocX - (int)x) >= 4096) || if ((Math.Abs((int)m_scene.RegionInfo.RegionLocX - (int)x) >= 4096) ||
(Math.Abs((int)m_scene.RegionInfo.RegionLocY - (int)y) >= 4096)) (Math.Abs((int)m_scene.RegionInfo.RegionLocY - (int)y) >= 4096))
{ {
return false; return false;
} }
return true; return true;
} }
else else
{ {
m_scene.CommsManager.GridService.RegisterRegion(regInfo); m_scene.CommsManager.GridService.RegisterRegion(regInfo);
m_log.Debug("[HGrid]: Gnomes. Region deregistered."); m_log.Debug("[HGrid]: Gnomes. Region deregistered.");
x = y = 0; x = y = 0;
return false; return false;
} }
} }
public static bool CheckCoords(uint thisx, uint thisy, uint x, uint y) public static bool CheckCoords(uint thisx, uint thisy, uint x, uint y)
{ {
if ((thisx == x) && (thisy == y)) if ((thisx == x) && (thisy == y))
return false; return false;
return true; return true;
} }
} }
} }

14
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -1023,7 +1023,7 @@ namespace OpenSim.Region.Framework.Scenes
// at region startup // at region startup
// teravus: After this was removed from the linking algorithm, Linked prims no longer collided // teravus: After this was removed from the linking algorithm, Linked prims no longer collided
// properly when non-physical if they havn't been moved. This breaks ALL builds. // properly when non-physical if they havn't been moved. This breaks ALL builds.
// see: http://opensimulator.org/mantis/view.php?id=3108 // see: http://opensimulator.org/mantis/view.php?id=3108
// Here's the deal, this is ABSOLUTELY CRITICAL so the physics scene gets the update about the // Here's the deal, this is ABSOLUTELY CRITICAL so the physics scene gets the update about the
@ -2074,12 +2074,12 @@ namespace OpenSim.Region.Framework.Scenes
// Can't do this yet since backup still makes use of the root part without any synchronization // Can't do this yet since backup still makes use of the root part without any synchronization
// objectGroup.m_rootPart = null; // objectGroup.m_rootPart = null;
AttachToBackup(); AttachToBackup();
// Here's the deal, this is ABSOLUTELY CRITICAL so the physics scene gets the update about the // Here's the deal, this is ABSOLUTELY CRITICAL so the physics scene gets the update about the
// position of linkset prims. IF YOU CHANGE THIS, YOU MUST TEST colliding with just linked and // position of linkset prims. IF YOU CHANGE THIS, YOU MUST TEST colliding with just linked and
// unmoved prims! // unmoved prims!
ResetChildPrimPhysicsPositions(); ResetChildPrimPhysicsPositions();
HasGroupChanged = true; HasGroupChanged = true;

8
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -1019,10 +1019,10 @@ namespace OpenSim.Region.Framework.Scenes
} }
//m_log.DebugFormat("Completed movement"); //m_log.DebugFormat("Completed movement");
} }
m_controllingClient.MoveAgentIntoRegion(m_regionInfo, AbsolutePosition, look); m_controllingClient.MoveAgentIntoRegion(m_regionInfo, AbsolutePosition, look);
} }
/// <summary> /// <summary>

280
OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
View File

@ -1,140 +1,140 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * 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 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System.Collections.Generic; using System.Collections.Generic;
using NUnit.Framework; using NUnit.Framework;
using OpenSim.Tests.Common; using OpenSim.Tests.Common;
using OpenSim.Region.ScriptEngine.Shared; using OpenSim.Region.ScriptEngine.Shared;
using OpenSim.Tests.Common.Setup; using OpenSim.Tests.Common.Setup;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using Nini.Config; using Nini.Config;
using OpenSim.Region.ScriptEngine.Shared.Api; using OpenSim.Region.ScriptEngine.Shared.Api;
using OpenMetaverse; using OpenMetaverse;
using System; using System;
namespace OpenSim.Region.ScriptEngine.Shared.Tests namespace OpenSim.Region.ScriptEngine.Shared.Tests
{ {
/// <summary> /// <summary>
/// Tests for LSL_Api /// Tests for LSL_Api
/// </summary> /// </summary>
[TestFixture] [TestFixture]
public class LSL_ApiTest public class LSL_ApiTest
{ {
private const double ANGLE_ACCURACY_IN_RADIANS = 1E-7; private const double ANGLE_ACCURACY_IN_RADIANS = 1E-7;
private LSL_Api lslApi; private LSL_Api lslApi;
[SetUp] [SetUp]
public void SetUp() public void SetUp()
{ {
IniConfigSource initConfigSource = new IniConfigSource(); IniConfigSource initConfigSource = new IniConfigSource();
IConfig config = initConfigSource.AddConfig("XEngine"); IConfig config = initConfigSource.AddConfig("XEngine");
config.Set("Enabled", "true"); config.Set("Enabled", "true");
Scene scene = SceneSetupHelpers.SetupScene(); Scene scene = SceneSetupHelpers.SetupScene();
SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene); SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
XEngine.XEngine engine = new XEngine.XEngine(); XEngine.XEngine engine = new XEngine.XEngine();
engine.Initialise(scene, initConfigSource); engine.Initialise(scene, initConfigSource);
lslApi = new LSL_Api(); lslApi = new LSL_Api();
lslApi.Initialize(engine, part, part.LocalId, part.UUID); lslApi.Initialize(engine, part, part.LocalId, part.UUID);
} }
[Test] [Test]
public void TestllAngleBetween() public void TestllAngleBetween()
{ {
TestllAngleBetween(new Vector3(1, 0, 0), 0); TestllAngleBetween(new Vector3(1, 0, 0), 0);
TestllAngleBetween(new Vector3(1, 0, 0), 90); TestllAngleBetween(new Vector3(1, 0, 0), 90);
TestllAngleBetween(new Vector3(1, 0, 0), 180); TestllAngleBetween(new Vector3(1, 0, 0), 180);
TestllAngleBetween(new Vector3(1, 0, 0), 270); TestllAngleBetween(new Vector3(1, 0, 0), 270);
TestllAngleBetween(new Vector3(0, 1, 0), 0); TestllAngleBetween(new Vector3(0, 1, 0), 0);
TestllAngleBetween(new Vector3(0, 1, 0), 90); TestllAngleBetween(new Vector3(0, 1, 0), 90);
TestllAngleBetween(new Vector3(0, 1, 0), 180); TestllAngleBetween(new Vector3(0, 1, 0), 180);
TestllAngleBetween(new Vector3(0, 1, 0), 270); TestllAngleBetween(new Vector3(0, 1, 0), 270);
TestllAngleBetween(new Vector3(0, 0, 1), 0); TestllAngleBetween(new Vector3(0, 0, 1), 0);
TestllAngleBetween(new Vector3(0, 0, 1), 90); TestllAngleBetween(new Vector3(0, 0, 1), 90);
TestllAngleBetween(new Vector3(0, 0, 1), 180); TestllAngleBetween(new Vector3(0, 0, 1), 180);
TestllAngleBetween(new Vector3(0, 0, 1), 270); TestllAngleBetween(new Vector3(0, 0, 1), 270);
TestllAngleBetween(new Vector3(1, 1, 1), 0); TestllAngleBetween(new Vector3(1, 1, 1), 0);
TestllAngleBetween(new Vector3(1, 1, 1), 90); TestllAngleBetween(new Vector3(1, 1, 1), 90);
TestllAngleBetween(new Vector3(1, 1, 1), 180); TestllAngleBetween(new Vector3(1, 1, 1), 180);
TestllAngleBetween(new Vector3(1, 1, 1), 270); TestllAngleBetween(new Vector3(1, 1, 1), 270);
} }
private void TestllAngleBetween(Vector3 axis,float originalAngle) private void TestllAngleBetween(Vector3 axis,float originalAngle)
{ {
Quaternion rotation1 = Quaternion.CreateFromAxisAngle(axis, 0); Quaternion rotation1 = Quaternion.CreateFromAxisAngle(axis, 0);
Quaternion rotation2 = Quaternion.CreateFromAxisAngle(axis, ToRadians(originalAngle)); Quaternion rotation2 = Quaternion.CreateFromAxisAngle(axis, ToRadians(originalAngle));
double deducedAngle = FromLslFloat(lslApi.llAngleBetween(ToLslQuaternion(rotation2), ToLslQuaternion(rotation1))); double deducedAngle = FromLslFloat(lslApi.llAngleBetween(ToLslQuaternion(rotation2), ToLslQuaternion(rotation1)));
Assert.Greater(deducedAngle, ToRadians(originalAngle) - ANGLE_ACCURACY_IN_RADIANS); Assert.Greater(deducedAngle, ToRadians(originalAngle) - ANGLE_ACCURACY_IN_RADIANS);
Assert.Less(deducedAngle, ToRadians(originalAngle) + ANGLE_ACCURACY_IN_RADIANS); Assert.Less(deducedAngle, ToRadians(originalAngle) + ANGLE_ACCURACY_IN_RADIANS);
} }
#region Conversions to and from LSL_Types #region Conversions to and from LSL_Types
private float ToRadians(double degrees) private float ToRadians(double degrees)
{ {
return (float)(Math.PI * degrees / 180); return (float)(Math.PI * degrees / 180);
} }
// private double FromRadians(float radians) // private double FromRadians(float radians)
// { // {
// return radians * 180 / Math.PI; // return radians * 180 / Math.PI;
// } // }
private double FromLslFloat(LSL_Types.LSLFloat lslFloat) private double FromLslFloat(LSL_Types.LSLFloat lslFloat)
{ {
return lslFloat.value; return lslFloat.value;
} }
// private LSL_Types.LSLFloat ToLslFloat(double value) // private LSL_Types.LSLFloat ToLslFloat(double value)
// { // {
// return new LSL_Types.LSLFloat(value); // return new LSL_Types.LSLFloat(value);
// } // }
// private Quaternion FromLslQuaternion(LSL_Types.Quaternion lslQuaternion) // private Quaternion FromLslQuaternion(LSL_Types.Quaternion lslQuaternion)
// { // {
// return new Quaternion((float)lslQuaternion.x, (float)lslQuaternion.y, (float)lslQuaternion.z, (float)lslQuaternion.s); // return new Quaternion((float)lslQuaternion.x, (float)lslQuaternion.y, (float)lslQuaternion.z, (float)lslQuaternion.s);
// } // }
private LSL_Types.Quaternion ToLslQuaternion(Quaternion quaternion) private LSL_Types.Quaternion ToLslQuaternion(Quaternion quaternion)
{ {
return new LSL_Types.Quaternion(quaternion.X, quaternion.Y, quaternion.Z, quaternion.W); return new LSL_Types.Quaternion(quaternion.X, quaternion.Y, quaternion.Z, quaternion.W);
} }
#endregion #endregion
} }
} }