ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 03:15:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

change lsl float parsing

Browse Source
This commit is contained in:
UbitUmarov
2023-02-18 02:01:52 +00:00
parent 361f6a9226
commit ac5321dfe4
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,10 +88,10 @@ namespace OpenSim.Region.ScriptEngine.Shared
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public Vector3(string str) : this(str.AsSpan()) { }
public Vector3(string str) : this(MemoryExtensions.AsSpan(str)) { }
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public Vector3(LSLString str) : this(str.m_string.AsSpan()) { }
public Vector3(LSLString str) : this(MemoryExtensions.AsSpan(str.m_string)) { }
public Vector3(ReadOnlySpan<char> str)
{
@@ -483,10 +483,10 @@ namespace OpenSim.Region.ScriptEngine.Shared
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public Quaternion(string str) : this(str.AsSpan()) { }
public Quaternion(string str) : this(MemoryExtensions.AsSpan(str)) { }
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public Quaternion(LSLString str) : this(str.m_string.AsSpan()) { }
public Quaternion(LSLString str) : this(MemoryExtensions.AsSpan(str.m_string)) { }
public Quaternion(ReadOnlySpan<char> str)
{
@@ -2511,23 +2511,12 @@ namespace OpenSim.Region.ScriptEngine.Shared
this.value = d;
}
public LSLFloat(string s)
public LSLFloat(string s) : this(MemoryExtensions.AsSpan(s)) { }
public LSLFloat(LSLString s) : this(MemoryExtensions.AsSpan(s.m_string)) { }
public LSLFloat(ReadOnlySpan<char> s)
{
Regex r = new("^ *(\\+|-)?([0-9]+\\.?[0-9]*|\\.[0-9]+)([eE](\\+|-)?[0-9]+)?");
Match m = r.Match(s);
string v = m.Groups[0].Value;
v = v.Trim();
if (string.IsNullOrEmpty(v))
v = "0.0";
else
if (!v.Contains('.') && !v.ToLower().Contains('e'))
v += ".0";
else
if (v.EndsWith('.'))
v += '0';
value = double.Parse(v, System.Globalization.NumberStyles.Float, Culture.NumberFormatInfo);
double.TryParse(s, System.Globalization.NumberStyles.Float, Culture.NumberFormatInfo, out value);
}
#endregion
@@ -2549,6 +2538,16 @@ namespace OpenSim.Region.ScriptEngine.Shared
return (uint)Math.Abs(f.value);
}
static public explicit operator string(LSLFloat f)
{
return string.Format(Culture.FormatProvider, "{0:0.000000}", f.value);
}
static public explicit operator LSLString(LSLFloat f)
{
return new LSLString(string.Format(Culture.FormatProvider, "{0:0.000000}", f.value));
}
static public implicit operator Boolean(LSLFloat f)
{
if (f.value == 0.0)