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

Implement LSLFloat {+,-,*,/} LSLFloat operations. Fix issues 1532, 1701, 1824 & 

1832.
0.6.0-stable
Mike Mazur 2008-07-27 05:42:47 +00:00
parent 290f942858
commit 6267db0c4c
3 changed files with 103 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
View File

@ -1511,6 +1511,26 @@ namespace OpenSim.Region.ScriptEngine.Common
return new LSLFloat(f.value / (double)i); return new LSLFloat(f.value / (double)i);
} }
static public LSLFloat operator +(LSLFloat lhs, LSLFloat rhs)
{
return new LSLFloat(lhs.value + rhs.value);
}
static public LSLFloat operator -(LSLFloat lhs, LSLFloat rhs)
{
return new LSLFloat(lhs.value - rhs.value);
}
static public LSLFloat operator *(LSLFloat lhs, LSLFloat rhs)
{
return new LSLFloat(lhs.value * rhs.value);
}
static public LSLFloat operator /(LSLFloat lhs, LSLFloat rhs)
{
return new LSLFloat(lhs.value / rhs.value);
}
static public LSLFloat operator -(LSLFloat f) static public LSLFloat operator -(LSLFloat f)
{ {
return new LSLFloat(-f.value); return new LSLFloat(-f.value);

20
OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
View File

@ -1579,6 +1579,26 @@ namespace OpenSim.Region.ScriptEngine.Shared
return new LSLFloat(f.value / (double)i); return new LSLFloat(f.value / (double)i);
} }
static public LSLFloat operator +(LSLFloat lhs, LSLFloat rhs)
{
return new LSLFloat(lhs.value + rhs.value);
}
static public LSLFloat operator -(LSLFloat lhs, LSLFloat rhs)
{
return new LSLFloat(lhs.value - rhs.value);
}
static public LSLFloat operator *(LSLFloat lhs, LSLFloat rhs)
{
return new LSLFloat(lhs.value * rhs.value);
}
static public LSLFloat operator /(LSLFloat lhs, LSLFloat rhs)
{
return new LSLFloat(lhs.value / rhs.value);
}
static public LSLFloat operator -(LSLFloat f) static public LSLFloat operator -(LSLFloat f)
{ {
return new LSLFloat(-f.value); return new LSLFloat(-f.value);

63
OpenSim/Tests/OpenSim/Region/ScriptEngine/Common/LSL_TypesTestLSLFloat.cs
View File

@ -496,5 +496,68 @@ namespace OpenSim.Region.ScriptEngine.Common.Tests
Assert.AreEqual(number.Value, testFloat.ToString()); Assert.AreEqual(number.Value, testFloat.ToString());
} }
} }
/// <summary>
/// Tests addition of two LSLFloats.
/// </summary>
[Test]
public void TestAddTwoLSLFloats()
{
LSL_Types.LSLFloat testResult;
foreach (KeyValuePair<double, double> number in m_doubleDoubleSet)
{
testResult = new LSL_Types.LSLFloat(number.Key) + new LSL_Types.LSLFloat(number.Value);
Assert.That(testResult.value, new DoubleToleranceConstraint(number.Key + number.Value, _lowPrecisionTolerance));
}
}
/// <summary>
/// Tests subtraction of two LSLFloats.
/// </summary>
[Test]
public void TestSubtractTwoLSLFloats()
{
LSL_Types.LSLFloat testResult;
foreach (KeyValuePair<double, double> number in m_doubleDoubleSet)
{
testResult = new LSL_Types.LSLFloat(number.Key) - new LSL_Types.LSLFloat(number.Value);
Assert.That(testResult.value, new DoubleToleranceConstraint(number.Key - number.Value, _lowPrecisionTolerance));
}
}
/// <summary>
/// Tests multiplication of two LSLFloats.
/// </summary>
[Test]
public void TestMultiplyTwoLSLFloats()
{
LSL_Types.LSLFloat testResult;
foreach (KeyValuePair<double, double> number in m_doubleDoubleSet)
{
testResult = new LSL_Types.LSLFloat(number.Key) * new LSL_Types.LSLFloat(number.Value);
Assert.That(testResult.value, new DoubleToleranceConstraint(number.Key * number.Value, _lowPrecisionTolerance));
}
}
/// <summary>
/// Tests division of two LSLFloats.
/// </summary>
[Test]
public void TestDivideTwoLSLFloats()
{
LSL_Types.LSLFloat testResult;
foreach (KeyValuePair<double, double> number in m_doubleDoubleSet)
{
if (number.Value != 0.0) // Let's avoid divide by zero.
{
testResult = new LSL_Types.LSLFloat(number.Key) / new LSL_Types.LSLFloat(number.Value);
Assert.That(testResult.value, new DoubleToleranceConstraint(number.Key / number.Value, _lowPrecisionTolerance));
}
}
}
} }
} }