1.2.0

.gitignore

@@ -73,3 +73,9 @@ Assets/Plugins.meta
 
 
 .DS_Store
+Packages/essential/Tests
+Packages/essential/Tests.meta
+Packages/variant.expression/Tests/
+Packages/codegen/Tests
+Packages/codegen/Tests.meta
+Packages/variant.expression/Tests.meta

Assets/___.cs

@@ -0,0 +1,2 @@
+// for generating Assembly-CSharp.dll
+public class ___ { }

Packages/builder.component/Editor/ComponentFieldCodeGenerator.cs

@@ -50,22 +50,7 @@ public string GenerateBuild(FieldInfo fi)
 
     public class BlobVariantFieldCodeGenerator : INodeDataFieldCodeGenerator
     {
-        protected const string HEAD_LINE = "// Automatically generated by `BlobVariantFieldCodeGenerator`";
-
-        public bool ShouldGenerateVariantInterface = true;
-        public string VariantInterfaceDirectory = "Variant";
         public string VariantInterfaceNamespace = "EntitiesBT.Variant";
-        public string VariantPropertyNameSuffix = "Variant";
-        public NodeCodeGenerator Generator;
-        public AssemblyDefinitionAsset Assembly;
-
-        private ISet<Assembly> _referenceAssemblies;
-
-        private bool IsReferenceType(Type type)
-        {
-            _referenceAssemblies ??= Assembly.ToAssembly().FindReferenceAssemblies();
-            return _referenceAssemblies.Contains(type.Assembly);
-        }
 
         public bool ShouldGenerate(FieldInfo fi)
         {
@@ -81,63 +66,16 @@ public string GenerateField(FieldInfo fi)
         {
             var valueType = fi.FieldType.GetGenericArguments()[0];
             var variantType = fi.FieldType.GetGenericTypeDefinition();
-            var readerSuffix = $"{VariantPropertyNameSuffix}Reader";
-            var writerSuffix = $"{VariantPropertyNameSuffix}Writer";
-            var readerAndWriterSuffix = $"{VariantPropertyNameSuffix}ReaderAndWriter";
-            if (ShouldGenerateVariantInterface)
-            {
-                if (variantType == typeof(BlobVariantReaderAndWriter<>))
-                {
-                    GenerateVariantInterface(valueType, readerSuffix, VariantGenerator.CreateReaderVariants);
-                    GenerateVariantInterface(valueType, writerSuffix, VariantGenerator.CreateWriterVariants);
-                    GenerateVariantInterface(valueType, readerAndWriterSuffix, (writer, valueType, isReferenceType, suffix) =>
-                    {
-                        writer.CreateReaderAndWriterVariants(valueType, isReferenceType, suffix);
-                        writer.CreateSerializedReaderAndWriterVariant(valueType, suffix, $"{VariantPropertyNameSuffix}Reader", $"{VariantPropertyNameSuffix}Writer");
-                    });
-                }
-                else if (variantType == typeof(BlobVariantReader<>))
-                {
-                    GenerateVariantInterface(valueType, readerSuffix, VariantGenerator.CreateReaderVariants);
-                }
-                else if (variantType == typeof(BlobVariantWriter<>))
-                {
-                    GenerateVariantInterface(valueType, writerSuffix, VariantGenerator.CreateWriterVariants);
-                }
-            }
-
             if (variantType == typeof(BlobVariantReaderAndWriter<>))
-                return $"public {VariantInterfaceNamespace}.{valueType.Name}SerializedReaderAndWriterVariant {fi.Name};";
-
-            var suffix = variantType == typeof(BlobVariantReader<>) ? readerSuffix : writerSuffix;
-            var stringBuilder = new StringBuilder();
-            stringBuilder.Append("[UnityEngine.SerializeReference, SerializeReferenceButton]");
-            stringBuilder.Append(" ");
-            stringBuilder.AppendLine($"public {VariantInterfaceNamespace}.{valueType.Name}{suffix} {fi.Name};");
-            return stringBuilder.ToString();
+                return $"public {VariantInterfaceNamespace}.SerializedVariantRW<{valueType.FullName}> {fi.Name};";
+            if (variantType == typeof(BlobVariantReader<>))
+                return $"public {VariantInterfaceNamespace}.SerializedVariantRO<{valueType.FullName}> {fi.Name};";
+            return $"public {VariantInterfaceNamespace}.SerializedVariantWO<{valueType.FullName}> {fi.Name};";
         }
 
         public string GenerateBuild(FieldInfo fi)
         {
             return $"{fi.Name}.Allocate(ref builder, ref data.{fi.Name}, Self, tree);";
         }
-
-        private void GenerateVariantInterface(Type valueType, string suffix, CreateVariants createVariants)
-        {
-            var directory = Path.GetDirectoryName(AssetDatabase.GetAssetPath(Generator)) + "/" + VariantInterfaceDirectory;
-            if (!Directory.Exists(directory)) Directory.CreateDirectory(directory);
-
-            var filepath = $"{directory}/{valueType.Name}{suffix}.cs";
-            if (!File.Exists(filepath) || File.ReadLines(filepath).FirstOrDefault() == HEAD_LINE)
-            {
-                using var writer = new StreamWriter(filepath);
-                writer.WriteLine(HEAD_LINE);
-                writer.WriteLine(VariantGenerator.NamespaceBegin(VariantInterfaceNamespace));
-                createVariants(writer, valueType, IsReferenceType, suffix);
-                writer.WriteLine(VariantGenerator.NamespaceEnd());
-            }
-        }
-
-        private delegate void CreateVariants(StreamWriter writer, Type valueType, Predicate<Type> isReferenceType, string suffix);
     }
 }

Packages/builder.component/Runtime/Components/BTDelayTimer.cs

@@ -8,7 +8,7 @@ namespace EntitiesBT.Components
 {
     public class BTDelayTimer : BTNode<EntitiesBT.Nodes.DelayTimerNode>
     {
-        public EntitiesBT.Variant.SingleSerializedReaderAndWriterVariant TimerSeconds;
+        public EntitiesBT.Variant.SerializedVariantRW<System.Single> TimerSeconds;
         protected override void Build(ref EntitiesBT.Nodes.DelayTimerNode data, BlobBuilder builder, ITreeNode<INodeDataBuilder>[] tree)
         {
             TimerSeconds.Allocate(ref builder, ref data.TimerSeconds, Self, tree);

Packages/builder.component/Runtime/Components/BTTimer.cs

@@ -8,7 +8,7 @@ namespace EntitiesBT.Components
 {
     public class BTTimer : BTNode<EntitiesBT.Nodes.TimerNode>
     {
-        public EntitiesBT.Variant.SingleSerializedReaderAndWriterVariant CountdownSeconds;
+        public EntitiesBT.Variant.SerializedVariantRW<System.Single> CountdownSeconds;
         public EntitiesBT.Core.NodeState BreakReturnState;
         protected override void Build(ref EntitiesBT.Nodes.TimerNode data, BlobBuilder builder, ITreeNode<INodeDataBuilder>[] tree)
         {

Packages/builder.component/Runtime/NodeCodeGenerator.asset

@@ -46,12 +46,6 @@ MonoBehaviour:
     00000005:
       type: {class: BlobVariantFieldCodeGenerator, ns: EntitiesBT.Editor, asm: EntitiesBT.Components.Editor}
       data:
-        ShouldGenerateVariantInterface: 1
-        VariantInterfaceDirectory: Variant
         VariantInterfaceNamespace: EntitiesBT.Variant
-        VariantPropertyNameSuffix: Variant
-        Generator: {fileID: 11400000}
-        Assembly: {fileID: 5897886265953266890, guid: c7babe7561eb244059259745ef27b866,
-          type: 3}
     00000006:
       type: {class: DefaultNodeDataFieldCodeGenerator, ns: EntitiesBT.Editor, asm: EntitiesBT.Editor}

Packages/builder.component/Runtime/Variant/NodeVariant.cs

@@ -6,7 +6,6 @@
 using Unity.Collections.LowLevel.Unsafe;
 using Unity.Entities;
 using UnityEngine;
-using UnityEngine.Scripting;
 using static EntitiesBT.Core.Utilities;
 
 namespace EntitiesBT.Variant
@@ -21,8 +20,12 @@ public VariantNodeObjectAttribute(string nodeObjectFieldName)
         }
     }
 
+    [VariantClass(ID_RUNTIME_NODE_VARIANT)]
     public class NodeVariant
     {
+        public const string ID_RUNTIME_NODE = "220681AA-D884-4E87-90A8-5A8657A734BD";
+        public const string ID_RUNTIME_NODE_VARIANT = "7DE6DCA5-71DF-4145-91A6-17EB813B9DEB";
+
         // TODO: check loop ref?
         [Serializable]
         public class Any<T> : IVariant where T : unmanaged
@@ -40,23 +43,20 @@ public unsafe IntPtr Allocate(ref BlobBuilder builder, ref BlobVariant blobVaria
         [Serializable] public class Writer<T> : Any<T>, IVariantWriter<T> where T : unmanaged {}
         [Serializable] public class ReaderAndWriter<T> : Any<T>, IVariantReaderAndWriter<T> where T : unmanaged {}
 
-        public const string ID_RUNTIME_NODE = "220681AA-D884-4E87-90A8-5A8657A734BD";
-        public const string ID_RUNTIME_NODE_VARIANT = "7DE6DCA5-71DF-4145-91A6-17EB813B9DEB";
-
-        [Preserve, WriterMethod(ID_RUNTIME_NODE_VARIANT)]
+        [WriterMethod]
         private static unsafe void WriteVariableFunc<T, TNodeBlob, TBlackboard>(ref BlobVariant blobVariant, int index, ref TNodeBlob blob, ref TBlackboard bb, T value)
             where T : unmanaged
             where TNodeBlob : struct, INodeBlob
             where TBlackboard : struct, IBlackboard
         {
-            ref var data = ref blobVariant.Value<DynamicNodeRefData>();
+            ref var data = ref blobVariant.As<DynamicNodeRefData>();
             var ptr = blob.GetRuntimeDataPtr(data.Index);
             ref var variable = ref UnsafeUtility.AsRef<BlobVariantReader<T>>(IntPtr.Add(ptr, data.Offset).ToPointer());
             // TODO: check writable on editor?
             variable.Value.WriteWithRefFallback(index, ref blob, ref bb, value);
         }
 
-        [Preserve, RefReaderMethod(ID_RUNTIME_NODE)]
+        [RefReaderMethod(OverrideGuid = ID_RUNTIME_NODE)]
         private static ref T GetRuntimeNodeData<T, TNodeBlob, TBlackboard>(ref BlobVariant blobVariant, int index, ref TNodeBlob blob, ref TBlackboard bb)
             where T : unmanaged
             where TNodeBlob : struct, INodeBlob
@@ -65,21 +65,21 @@ private static ref T GetRuntimeNodeData<T, TNodeBlob, TBlackboard>(ref BlobVaria
             return ref GetValue<T>(ref blobVariant, blob.GetRuntimeDataPtr);
         }
 
-        [Preserve, ReaderMethod(ID_RUNTIME_NODE_VARIANT)]
+        [ReaderMethod]
         private static unsafe T GetRuntimeNodeVariable<T, TNodeBlob, TBlackboard>(ref BlobVariant blobVariant, int index, ref TNodeBlob blob, ref TBlackboard bb)
             where T : unmanaged
             where TNodeBlob : struct, INodeBlob
             where TBlackboard : struct, IBlackboard
         {
-            ref var data = ref blobVariant.Value<DynamicNodeRefData>();
+            ref var data = ref blobVariant.As<DynamicNodeRefData>();
             var ptr = blob.GetRuntimeDataPtr(data.Index);
             ref var variable = ref UnsafeUtility.AsRef<BlobVariantReader<T>>(IntPtr.Add(ptr, data.Offset).ToPointer());
             return variable.Read(index, ref blob, ref bb);
         }
 
         private static unsafe ref T GetValue<T>(ref BlobVariant blobVariant, Func<int, IntPtr> ptrFunc) where T : unmanaged
         {
-            ref var data = ref blobVariant.Value<DynamicNodeRefData>();
+            ref var data = ref blobVariant.As<DynamicNodeRefData>();
             var ptr = ptrFunc(data.Index);
             return ref UnsafeUtility.AsRef<T>(IntPtr.Add(ptr, data.Offset).ToPointer());
         }

Packages/builder.component/package.json

@@ -1,11 +1,10 @@
 {
   "name": "com.quabug.entities-bt.builder.component",
   "description": "Behavior Tree for Unity Entities - Component Builder",
-  "version": "1.0.2",
+  "version": "1.2.0",
   "unity": "2020.2",
   "displayName": "EntitiesBT - Component Builder",
   "dependencies": {
-    "com.quabug.entities-bt.essential": "1.0.1",
-    "com.quabug.entities-bt.variable.scriptable-object": "1.0.1"
+    "com.quabug.entities-bt.essential": "1.2.0"
   }
 }

Packages/builder.odin/Editor/EntitiesBT.Builder.Odin.Editor.asmdef

@@ -6,7 +6,9 @@
         "EntitiesBT.Runtime",
         "EntitiesBT.Builder.Odin"
     ],
-    "includePlatforms": [],
+    "includePlatforms": [
+        "Editor"
+    ],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
     "overrideReferences": true,

Packages/builder.odin/Runtime/SaveToLocalVariant.cs

@@ -7,6 +7,7 @@
 
 namespace EntitiesBT.Components.Odin
 {
+    [VariantClass(GUID)]
     public class SaveToLocalVariant
     {
         [Serializable]
@@ -27,7 +28,7 @@ public IntPtr Allocate(ref BlobBuilder builder, ref BlobVariant blobVariant, INo
 
         public const string GUID = "F315684E-2AA1-4780-B31B-2791A93359F1";
 
-        [Preserve, RefReaderMethod(GUID)]
+        [RefReaderMethod]
         private static ref T Read<T, TNodeBlob, TBlackboard>(ref BlobVariant blobVariant, int index, ref TNodeBlob blob, ref TBlackboard bb)
             where T : unmanaged
             where TNodeBlob : struct, INodeBlob