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

add llList2ListSlice

Browse Source
This commit is contained in:
UbitUmarov
2023-04-27 21:55:55 +01:00
parent 7b7071f778
commit 46831b086e
3 changed files with 75 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -5587,8 +5587,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Integer llGetListEntryType(LSL_List src, int index)
{
if (index < 0)
{
index = src.Length + index;
if (index >= src.Length || index < 0)
if (index < 0)
return 0;
}
else if (index >= src.Length)
return 0;
object o = src.Data[index];
@@ -5597,16 +5601,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (o is LSL_Float || o is Single || o is Double)
return 2;
if (o is LSL_String || o is String)
{
if (UUID.TryParse(o.ToString(), out UUID _))
{
return 4;
}
else
{
return 3;
}
}
return UUID.TryParse(o.ToString(), out UUID _) ? 4 : 3;
if (o is LSL_Key)
return 4;
if (o is LSL_Vector)
@@ -5850,6 +5845,70 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return result;
}
public LSL_List llList2ListSlice(LSL_List src, int start, int end, int stride, int stride_index)
{
if (start < 0)
{
start += src.Length;
if (start < 0)
start = 0;
}
if (end < 0)
{
end += src.Length;
if (end < 0)
end = 0;
}
if (start > end)
{
start = 0;
end = src.Length - 1;
}
else
{
if (start >= src.Length)
return new LSL_List();
if (end >= src.Length)
end = src.Length - 1;
}
if (stride < 1)
stride = 1;
if (stride_index < 0)
{
stride_index += stride;
if (stride_index < 0)
return new LSL_List();
}
else if (stride_index >= stride)
return new LSL_List();
int size;
if (stride > 1)
{
if (start > 0)
{
int sst = start / stride;
sst *= stride;
if (sst != start)
start = sst + stride;
if (start > end)
return new LSL_List();
}
start += stride_index;
size = end - start + 1;
int sz = size / stride;
if (sz * stride < size)
sz++;
size = sz;
}
else
size = end - start + 1;
object[] res = new object[size];
int j = 0;
for (int i = start; i <= end; i += stride, j++)
res[j] = src.Data[i];
m_log.Debug($" test {size} {j}");
return new LSL_List(res);
}
public LSL_Integer llGetRegionAgentCount()
{

1
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
View File

@@ -248,6 +248,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
LSL_Key llList2Key(LSL_List src, int index);
LSL_List llList2List(LSL_List src, int start, int end);
LSL_List llList2ListStrided(LSL_List src, int start, int end, int stride);
LSL_List llList2ListSlice(LSL_List src, int start, int end, int stride, int stride_index);
LSL_Rotation llList2Rot(LSL_List src, int index);
LSL_String llList2String(LSL_List src, int index);
LSL_Vector llList2Vector(LSL_List src, int index);

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

@@ -1285,14 +1285,10 @@ namespace OpenSim.Region.ScriptEngine.Shared
// longer relative to the end of the list.
if (start < 0)
{
start = Data.Length + start;
}
start += Data.Length;
if (end < 0)
{
end = Data.Length + end;
}
end += Data.Length;
// The conventional case is start <= end
// NOTE that the case of an empty list is
@@ -1306,21 +1302,15 @@ namespace OpenSim.Region.ScriptEngine.Shared
// Start sublist beyond length
// Also deals with start AND end still negative
if (start >= Data.Length || end < 0)
{
return new list();
}
// Sublist extends beyond the end of the supplied list
if (end >= Data.Length)
{
end = Data.Length - 1;
}
// Sublist still starts before the beginning of the list
if (start < 0)
{
start = 0;
}
ret = new object[end - start + 1];
@@ -1559,7 +1549,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
if (stride_index < 0)
{
stride_index = stride + stride_index;
stride_index += stride;
if (stride_index < 0)
return new list();
}
@@ -1613,7 +1603,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
if (stride_index < 0)
{
stride_index = stride + stride_index;
stride_index += stride;
if (stride_index < 0)
return;
}