Merge pull request #3 from moorestech/codex/jsonパース処理の生成

Add vector types parsing

Author: sakastudio

CommandForgeGenerator.SandBox/Program.cs

@@ -12,9 +12,9 @@ private static void Main(string[] args)
         var json = GetJson();
         var loader = CommandForgeLoader.LoadCommands(json);
 
-        if (loader.Count == 152)
+        if (loader.Count == 12)
         {
-            Console.WriteLine(loader.Count == 152 ? "OK" : "NG");
+            Console.WriteLine("OK");
         }
         else
         {

CommandForgeGenerator.SandBox/SampleProject/commands.yaml

@@ -14,6 +14,15 @@ commands:
         multiline: true
         required: true
 
+  - id: characterPosition
+    label: カメラ位置
+    description: カメラ位置
+    commandListLabelFormat: "カメラ移動 {position}"
+    properties:
+      position:
+        type: vector3
+        required: true
+
   - id: emote
     label: エモート
     description: 立ち絵・表情切替

CommandForgeGenerator.SandBox/SampleProject/skits/sample_skit.json

@@ -73,6 +73,11 @@
       "type": "wait",
       "seconds": 0.5,
       "backgroundColor": "#57e317"
+    },
+    {
+      "id": 100,
+      "type": "characterPosition",
+      "position": [0, 10.5 , 0]
     }
   ]
 }

CommandForgeGenerator/CodeGenerate/CodeGenerator.cs

@@ -119,6 +119,31 @@ private static string GenerateCreateMethodTempVariables(List<CommandProperty> co
             {
                 properties.AppendLine($"var {property.CodeProperty} = (CommandId)((int)json[\"{property.Name}\"]);");
             }
+            else if (property.Type is CommandPropertyType.Vector2)
+            {
+                properties.AppendLine($"var {property.CodeProperty}Array = json[\"{property.Name}\"];");
+                properties.AppendLine($"var {property.CodeProperty} = new global::UnityEngine.Vector2((float){property.CodeProperty}Array[0], (float){property.CodeProperty}Array[1]);");
+            }
+            else if (property.Type is CommandPropertyType.Vector3)
+            {
+                properties.AppendLine($"var {property.CodeProperty}Array = json[\"{property.Name}\"];");
+                properties.AppendLine($"var {property.CodeProperty} = new global::UnityEngine.Vector3((float){property.CodeProperty}Array[0], (float){property.CodeProperty}Array[1], (float){property.CodeProperty}Array[2]);");
+            }
+            else if (property.Type is CommandPropertyType.Vector4)
+            {
+                properties.AppendLine($"var {property.CodeProperty}Array = json[\"{property.Name}\"];");
+                properties.AppendLine($"var {property.CodeProperty} = new global::UnityEngine.Vector4((float){property.CodeProperty}Array[0], (float){property.CodeProperty}Array[1], (float){property.CodeProperty}Array[2], (float){property.CodeProperty}Array[3]);");
+            }
+            else if (property.Type is CommandPropertyType.Vector2Int)
+            {
+                properties.AppendLine($"var {property.CodeProperty}Array = json[\"{property.Name}\"];");
+                properties.AppendLine($"var {property.CodeProperty} = new global::UnityEngine.Vector2Int((int){property.CodeProperty}Array[0], (int){property.CodeProperty}Array[1]);");
+            }
+            else if (property.Type is CommandPropertyType.Vector3Int)
+            {
+                properties.AppendLine($"var {property.CodeProperty}Array = json[\"{property.Name}\"];");
+                properties.AppendLine($"var {property.CodeProperty} = new global::UnityEngine.Vector3Int((int){property.CodeProperty}Array[0], (int){property.CodeProperty}Array[1], (int){property.CodeProperty}Array[2]);");
+            }
             else
             {
                 properties.AppendLine($"var {property.CodeProperty} = ({type})json[\"{property.Name}\"];");
@@ -173,6 +198,11 @@ private static string GetTypeCode(CommandPropertyType type)
             CommandPropertyType.Float => "float",
             CommandPropertyType.Bool => "bool",
             CommandPropertyType.CommandId => "CommandId",
+            CommandPropertyType.Vector2 => "global::UnityEngine.Vector2",
+            CommandPropertyType.Vector3 => "global::UnityEngine.Vector3",
+            CommandPropertyType.Vector4 => "global::UnityEngine.Vector4",
+            CommandPropertyType.Vector2Int => "global::UnityEngine.Vector2Int",
+            CommandPropertyType.Vector3Int => "global::UnityEngine.Vector3Int",
             _ => throw new ArgumentOutOfRangeException(nameof(type), type, null)
         };
     }

CommandForgeGenerator/CommandForgeGenerator.csproj

@@ -18,7 +18,7 @@
         <!-- NuGet Package Metadata -->
         <Title>CommandForge Generator</Title>
         <Authors>Moorestech</Authors>
-        <Version>1.0.2</Version>
+        <Version>1.0.3</Version>
         <Description>CommandForgeEditorのcommands.yamlのC#コードを生成するSourceGenerator</Description>
         <PackageProjectUrl>https://github.com/moorestech/CommandForgeGenerator</PackageProjectUrl>
         <RepositoryUrl>https://github.com/moorestech/CommandForgeGenerator</RepositoryUrl>

CommandForgeGenerator/Semantic/CommandSemanticsLoader.cs

@@ -82,6 +82,11 @@ CommandsSemantics ParseCommandsSchema(JsonObject root)
                         "boolean" => CommandPropertyType.Bool,
                         "enum" => CommandPropertyType.String,
                         "command" => CommandPropertyType.CommandId,
+                        "vector2" => CommandPropertyType.Vector2,
+                        "vector3" => CommandPropertyType.Vector3,
+                        "vector4" => CommandPropertyType.Vector4,
+                        "vector2int" => CommandPropertyType.Vector2Int,
+                        "vector3int" => CommandPropertyType.Vector3Int,
                         _ => throw new Exception($"未知の property type \"{typeStr}\"")
                     };
 

CommandForgeGenerator/Semantic/CommandsSemantics.cs

@@ -45,4 +45,9 @@ public enum CommandPropertyType{
     Float,
     Bool,
     CommandId,
+    Vector2,
+    Vector3,
+    Vector4,
+    Vector2Int,
+    Vector3Int,
 }