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

Add support for using structures as Visual Script and Anim Graph parameters

Browse Source
This commit is contained in:
Wojtek Figat
2021-07-29 23:35:30 +02:00
parent 24782bdd2f
commit d8f555e8dc
5 changed files with 32 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -414,15 +414,6 @@ namespace FlaxEditor.Utilities
var id = stream.ReadGuid();
return FlaxEngine.Object.Find(ref id, type ?? typeof(FlaxEngine.Object));
}
case VariantType.Structure:
{
if (type == null)
throw new Exception("Missing structure type of the Variant.");
if (!type.IsStructure())
throw new Exception($"Invalid type {type.FullName} used as a structure.");
var data = stream.ReadBytes(stream.ReadInt32());
return Utils.ByteArrayToStructure(data, type);
}
case VariantType.Asset:
{
var id = stream.ReadGuid();
@@ -479,6 +470,7 @@ namespace FlaxEditor.Utilities
return TypeUtils.GetType(typeName);
}
case VariantType.ManagedObject:
case VariantType.Structure:
{
if (type == null)
throw new Exception("Missing type of the Variant typename " + typeName);
@@ -580,13 +572,6 @@ namespace FlaxEditor.Utilities
id = ((FlaxEngine.Object)value).ID;
stream.WriteGuid(ref id);
break;
case VariantType.Structure:
{
var data = Utils.StructureToByteArray(value, type);
stream.Write(data.Length);
stream.Write(data);
break;
}
case VariantType.Asset:
id = ((Asset)value).ID;
stream.WriteGuid(ref id);
@@ -664,6 +649,7 @@ namespace FlaxEditor.Utilities
stream.WriteStrAnsi(((ScriptType)value).TypeName, -14);
break;
case VariantType.ManagedObject:
case VariantType.Structure:
{
stream.Write((byte)1);
var json = FlaxEngine.Json.JsonSerializer.Serialize(value, type);
@@ -690,6 +676,7 @@ namespace FlaxEditor.Utilities
break;
case VariantType.Enum:
case VariantType.Structure:
case VariantType.ManagedObject:
withoutTypeName = false;
break;
}
@@ -1115,6 +1102,7 @@ namespace FlaxEditor.Utilities
stream.WriteValue(((ScriptType)value).TypeName);
break;
case VariantType.ManagedObject:
case VariantType.Structure:
{
var json = FlaxEngine.Json.JsonSerializer.Serialize(value, type);
stream.WriteRaw(json);