GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Add better support for Arrays in Variant for C# Scripting

Browse Source
This commit is contained in:
Wojciech Figat
2021-11-16 20:46:04 +01:00
parent 4722b58a40
commit 13deb4a54f
4 changed files with 132 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Source/Editor/Utilities/VariantUtils.cs
View File

@@ -132,7 +132,7 @@ namespace FlaxEditor.Utilities
variantType = VariantType.Structure;
else if (type == typeof(byte[]))
variantType = VariantType.Blob;
else if (type == typeof(object[]))
else if (type.IsArray)
variantType = VariantType.Array;
else if (type == typeof(Dictionary<object, object>))
variantType = VariantType.Dictionary;
@@ -210,6 +210,15 @@ namespace FlaxEditor.Utilities
stream.Write(int.MaxValue);
stream.WriteStrAnsi(type.FullName, 77);
break;
case VariantType.Array:
if (type != typeof(object[]))
{
stream.Write(int.MaxValue);
stream.WriteStrAnsi(type.FullName, 77);
}
else
stream.Write(0);
break;
default:
stream.Write(0);
break;
@@ -443,10 +452,14 @@ namespace FlaxEditor.Utilities
case VariantType.Matrix: return stream.ReadMatrix();
case VariantType.Array:
{
if (type == null)
type = typeof(object[]);
else if (!type.IsArray)
throw new Exception("Invalid arry type for the Variant array " + typeName);
var count = stream.ReadInt32();
var result = new object[count];
var result = Array.CreateInstance(type.GetElementType(), count);
for (int i = 0; i < count; i++)
result[i] = stream.ReadVariant();
result.SetValue(stream.ReadVariant(), i);
return result;
}
case VariantType.Dictionary:
@@ -630,10 +643,13 @@ namespace FlaxEditor.Utilities
stream.Write((Matrix)value);
break;
case VariantType.Array:
stream.Write(((object[])value).Length);
foreach (var e in (object[])value)
{
var array = (Array)value;
stream.Write(array.Length);
foreach (var e in array)
stream.WriteVariant(e);
break;
}
case VariantType.Dictionary:
stream.Write(((Dictionary<object, object>)value).Count);
foreach (var e in (Dictionary<object, object>)value)
@@ -679,6 +695,10 @@ namespace FlaxEditor.Utilities
case VariantType.ManagedObject:
withoutTypeName = false;
break;
case VariantType.Array:
if (value != typeof(object[]))
withoutTypeName = false;
break;
}
if (withoutTypeName)
{
@@ -1077,7 +1097,7 @@ namespace FlaxEditor.Utilities
case VariantType.Array:
{
stream.WriteStartArray();
foreach (var e in (object[])value)
foreach (var e in (Array)value)
stream.WriteVariant(e);
stream.WriteEndArray();
break;