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

Refresh LSLTypes.cs in Shared/ from the one in Common/, which was 

more complete.
0.6.0-stable
Melanie Thielker 2008-07-28 01:33:21 +00:00
parent e2ce142669
commit 40bb4edf8c
1 changed files with 45 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,9 +141,9 @@ namespace OpenSim.Region.ScriptEngine.Shared
return new Vector3(lhs.x - rhs.x, lhs.y - rhs.y, lhs.z - rhs.z); return new Vector3(lhs.x - rhs.x, lhs.y - rhs.y, lhs.z - rhs.z);
} }
public static Vector3 operator *(Vector3 lhs, Vector3 rhs) public static LSLFloat operator *(Vector3 lhs, Vector3 rhs)
{ {
return new Vector3(lhs.x * rhs.x, lhs.y * rhs.y, lhs.z * rhs.z); return Dot(lhs, rhs);
} }
public static Vector3 operator %(Vector3 v1, Vector3 v2) public static Vector3 operator %(Vector3 v1, Vector3 v2)
@ -989,22 +989,22 @@ namespace OpenSim.Region.ScriptEngine.Shared
// BELOW IS WORK IN PROGRESS... IT WILL CHANGE, SO DON'T USE YET! :) // BELOW IS WORK IN PROGRESS... IT WILL CHANGE, SO DON'T USE YET! :)
// //
// public struct StringTest public struct StringTest
// { {
// // Our own little string // Our own little string
// internal string actualString; internal string actualString;
// public static implicit operator bool(StringTest mString) public static implicit operator bool(StringTest mString)
// { {
// if (mString.actualString.Length == 0) if (mString.actualString.Length == 0)
// return true; return true;
// return false; return false;
// } }
// public override string ToString() public override string ToString()
// { {
// return actualString; return actualString;
// } }
//
// } }
[Serializable] [Serializable]
public struct key public struct key
@ -1106,11 +1106,6 @@ namespace OpenSim.Region.ScriptEngine.Shared
m_string = s; m_string = s;
} }
public LSLString(int i)
{
m_string=i.ToString();
}
public LSLString(double d) public LSLString(double d)
{ {
string s=String.Format("{0:0.000000}", d); string s=String.Format("{0:0.000000}", d);
@ -1180,11 +1175,6 @@ namespace OpenSim.Region.ScriptEngine.Shared
return new LSLInteger(Convert.ToInt32(s.m_string)); return new LSLInteger(Convert.ToInt32(s.m_string));
} }
public static explicit operator LSLString(int i)
{
return new LSLString(i);
}
public static explicit operator LSLString(double d) public static explicit operator LSLString(double d)
{ {
return new LSLString(d); return new LSLString(d);
@ -1250,19 +1240,6 @@ namespace OpenSim.Region.ScriptEngine.Shared
value = (int)d; value = (int)d;
} }
public LSLInteger(Object o)
{
if (!(o is Int32))
value = 0;
else
value = (int)o;
}
public LSLInteger(string s)
{
value = int.Parse(s);
}
#endregion #endregion
#region Operators #region Operators
@ -1282,11 +1259,6 @@ namespace OpenSim.Region.ScriptEngine.Shared
return new LSLString(i.ToString()); return new LSLString(i.ToString());
} }
static public explicit operator string(LSLInteger i)
{
return i.ToString();
}
static public implicit operator Boolean(LSLInteger i) static public implicit operator Boolean(LSLInteger i)
{ {
if (i.value == 0) if (i.value == 0)
@ -1376,6 +1348,18 @@ namespace OpenSim.Region.ScriptEngine.Shared
return new LSLInteger(-i.value); return new LSLInteger(-i.value);
} }
public override bool Equals(Object o)
{
if (!(o is LSLInteger))
return false;
return value == ((LSLInteger)o).value;
}
public override int GetHashCode()
{
return value;
}
static public LSLInteger operator &(LSLInteger i1, LSLInteger i2) static public LSLInteger operator &(LSLInteger i1, LSLInteger i2)
{ {
int ret = i1.value & i2.value; int ret = i1.value & i2.value;
@ -1400,11 +1384,6 @@ namespace OpenSim.Region.ScriptEngine.Shared
return (double)i.value; return (double)i.value;
} }
static public implicit operator LSLFloat(LSLInteger i)
{
return new LSLFloat((double)i.value);
}
public static bool operator true(LSLInteger i) public static bool operator true(LSLInteger i)
{ {
return i.value != 0; return i.value != 0;
@ -1424,24 +1403,6 @@ namespace OpenSim.Region.ScriptEngine.Shared
return this.value.ToString(); return this.value.ToString();
} }
public override bool Equals(object o)
{
if (o is Int32)
{
return value == (Int32)o;
}
if (o is LSLInteger)
{
return value == ((LSLInteger)o).value;
}
return false;
}
public override int GetHashCode()
{
return value.GetHashCode();
}
#endregion #endregion
} }
@ -1454,28 +1415,12 @@ namespace OpenSim.Region.ScriptEngine.Shared
public LSLFloat(int i) public LSLFloat(int i)
{ {
value = (double)i; this.value = (double)i;
} }
public LSLFloat(double d) public LSLFloat(double d)
{ {
value = d; this.value = d;
}
public LSLFloat(string s)
{
value = double.Parse(s);
}
public LSLFloat(Object o)
{
if (!((o is double) || (o is float)))
{
value = 0.0;
return;
}
value = (double)o;
} }
#endregion #endregion
@ -1534,19 +1479,6 @@ namespace OpenSim.Region.ScriptEngine.Shared
return f1.value != f2.value; return f1.value != f2.value;
} }
public override bool Equals(Object o)
{
if (!(o is LSLFloat))
return false;
return value == ((LSLFloat)o).value;
}
public override int GetHashCode()
{
return (int)value;
}
static public LSLFloat operator ++(LSLFloat f) static public LSLFloat operator ++(LSLFloat f)
{ {
f.value++; f.value++;
@ -1618,6 +1550,19 @@ namespace OpenSim.Region.ScriptEngine.Shared
return String.Format("{0:0.000000}", this.value); return String.Format("{0:0.000000}", this.value);
} }
public override bool Equals(Object o)
{
if (!(o is LSLFloat))
return false;
return value == ((LSLFloat)o).value;
}
public override int GetHashCode()
{
return Convert.ToInt32(value);
}
#endregion #endregion
} }
} }