version 0.6.1

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## [0.6.1] - 2020-01-20
+- Refactored source code
+
 ## [0.6.0] - 2020-01-17
 - Added `VGO_materials` property to materials extension.
 - Added `VRMC_materials_mtoon` property to materials extension.

UniGLTFforUniVgo/README.md

@@ -17,7 +17,7 @@ The main design pattern of this plugin is abstracted from ousttrue's UniGLTF.
 * https://github.com/ousttrue/UniGLTF
 
 ___
-Last updated: 1 January, 2020 
+Last updated: 1 January, 2020  
 Editor: Izayoi Jiichan
 
 *Copyright (C) 2020 Izayoi Jiichan. All Rights Reserved.*

UniGLTFforUniVgo/Runtime/Extensions/UnityExtensions.cs

@@ -247,6 +247,11 @@ public static float[] ToArray(this Quaternion q)
             return new float[] { q.x, q.y, q.z, q.w };
         }
 
+        public static float[] ToArray(this Vector2 v)
+        {
+            return new float[] { v.x, v.y };
+        }
+
         public static float[] ToArray(this Vector3 v)
         {
             return new float[] { v.x, v.y, v.z };

UniGLTFforUniVgo/Runtime/IO/MaterialExporter.cs

@@ -221,11 +221,8 @@ static glTFMaterial CreateUnlitMaterialDefault(Material m)
                 },
                 extensions = new glTFMaterial_extensions
                 {
-                    KHR_materials_unlit = new glTF_KHR_materials_unlit(),
-                    VGO_materials = new glTF_VGO_materials()
-                    {
-                        shaderName = m.shader.name,
-                    }
+                    VGO_materials = new VGO_materials(m.shader.name),
+                    KHR_materials_unlit = new KHR_materials_unlit(),
                 },
             };
         }
@@ -301,10 +298,7 @@ static glTFMaterial Export_Standard(Material m)
                 pbrMetallicRoughness = new glTFPbrMetallicRoughness(),
                 extensions = new glTFMaterial_extensions
                 {
-                    VGO_materials = new glTF_VGO_materials()
-                    {
-                        shaderName = m.shader.name,
-                    }
+                    VGO_materials = new VGO_materials(m.shader.name),
                 },
             };
 

UniGLTFforUniVgo/Runtime/IO/gltfExporter.cs

@@ -104,7 +104,7 @@ protected virtual IEnumerable<string> ExtensionUsed
         {
             get
             {
-                yield return glTF_KHR_materials_unlit.ExtensionName;
+                yield return KHR_materials_unlit.ExtensionName;
             }
         }
 

UniGLTFforUniVgo/Runtime/Schema/Extensions/glTF_VGO_materials.cs → UniGLTFforUniVgo/Runtime/Schema/Extensions/Materials/KHR_materials_unlit.cs

@@ -1,23 +1,20 @@
 // ----------------------------------------------------------------------
 // @Namespace : UniGLTFforUniVgo
-// @Class     : glTF_VGO_materials
+// @Class     : KHR_materials_unlit
 // ----------------------------------------------------------------------
 namespace UniGLTFforUniVgo
 {
     using Newtonsoft.Json;
     using System;
 
     /// <summary>
-    /// 
+    /// KHR materials unlit
     /// </summary>
     [Serializable]
-    public class glTF_VGO_materials
+    [JsonObject("material.extensions.KHR_materials_unlit")]
+    public class KHR_materials_unlit
     {
-        /// <summary>Shader Name</summary>
-        [JsonProperty("shaderName", Required = Required.Always)]
-        public string shaderName = null;
-
         [JsonIgnore]
-        public static string ExtensionName => "VGO_materials";
+        public static string ExtensionName => "KHR_materials_unlit";
     }
 }

UniGLTFforUniVgo/Runtime/Schema/Extensions/Materials/VGO_materials.cs

@@ -0,0 +1,44 @@
+// ----------------------------------------------------------------------
+// @Namespace : UniGLTFforUniVgo
+// @Class     : VGO_materials
+// ----------------------------------------------------------------------
+namespace UniGLTFforUniVgo
+{
+    using Newtonsoft.Json;
+    using System;
+
+    /// <summary>
+    /// VGO materials
+    /// </summary>
+    [Serializable]
+    [JsonObject("material.extensions.VGO_materials")]
+    public class VGO_materials
+    {
+        /// <summary>Shader Name</summary>
+        [JsonProperty("shaderName", Required = Required.Always)]
+        public string shaderName = null;
+
+        [JsonIgnore]
+        public static string ExtensionName => "VGO_materials";
+
+        #region Constructors
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public VGO_materials()
+        {
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="shaderName"></param>
+        public VGO_materials(string shaderName)
+        {
+            this.shaderName = shaderName;
+        }
+
+        #endregion
+    }
+}

UniGLTFforUniVgo/Runtime/Schema/Extensions/glTF_VRMC_materials_mtoon.cs → UniGLTFforUniVgo/Runtime/Schema/Extensions/Materials/VRMC_materials_mtoon.cs

@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------
 // @Namespace : UniGLTFforUniVgo
-// @Class     : glTF_VRMC_materials_mtoon
+// @Class     : VRMC_materials_mtoon
 // ----------------------------------------------------------------------
 namespace UniGLTFforUniVgo
 {
@@ -60,7 +60,8 @@ public enum MToonRenderMode
     /// VRM/MToon shader properties
     /// </summary>
     [Serializable]
-    public class glTF_VRMC_materials_mtoon
+    [JsonObject("material.extensions.VRMC_materials_mtoon")]
+    public class VRMC_materials_mtoon
     {
         /// <summary>_MToonVersion</summary>
         [JsonProperty("version")]

UniGLTFforUniVgo/Runtime/Schema/Extensions/glTFMaterial.cs → UniGLTFforUniVgo/Runtime/Schema/Extensions/Materials/glTFMaterial_extensions.cs

@@ -11,18 +11,19 @@ namespace UniGLTFforUniVgo
     /// glTF Material extensions
     /// </summary>
     [Serializable]
-    public partial class glTFMaterial_extensions : ExtensionsBase<glTFMaterial_extensions>
+    [JsonObject("material.extensions")]
+    public class glTFMaterial_extensions
     {
         /// <summary></summary>
-        [JsonProperty("KHR_materials_unlit")]
-        public glTF_KHR_materials_unlit KHR_materials_unlit;
+        [JsonProperty("VGO_materials")]
+        public VGO_materials VGO_materials = null;
 
         /// <summary></summary>
-        [JsonProperty("VGO_materials")]
-        public glTF_VGO_materials VGO_materials;
+        [JsonProperty("KHR_materials_unlit")]
+        public KHR_materials_unlit KHR_materials_unlit = null;
 
         /// <summary></summary>
         [JsonProperty("VRMC_materials_mtoon")]
-        public glTF_VRMC_materials_mtoon VRMC_materials_mtoon;
+        public VRMC_materials_mtoon VRMC_materials_mtoon = null;
     }
 }

UniGLTFforUniVgo/Runtime/Schema/Extensions/glTFNode_VGO_Collider.cs → UniGLTFforUniVgo/Runtime/Schema/Extensions/Nodes/VGO_Collider.cs

@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------
 // @Namespace : UniGLTFforUniVgo
-// @Class     : glTFNode_VGO_Collider
+// @Class     : VGO_Collider
 // ----------------------------------------------------------------------
 namespace UniGLTFforUniVgo
 {
@@ -25,7 +25,7 @@ public enum ColliderType
     /// </summary>
     [Serializable]
     [JsonObject("node.vgo.collider")]
-    public class glTFNode_VGO_Collider
+    public class VGO_Collider
     {
         /// <summary>Enabled</summary>
         [JsonProperty("enabled", DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
@@ -65,6 +65,6 @@ public class glTFNode_VGO_Collider
 
         /// <summary>Physic Material</summary>
         [JsonProperty("physicMaterial")]
-        public glTFNode_VGO_PhysicMaterial physicMaterial = null;
+        public VGO_PhysicMaterial physicMaterial = null;
     }
 }

UniGLTFforUniVgo/Runtime/Schema/Extensions/glTFNode_VGO_GameObject.cs → UniGLTFforUniVgo/Runtime/Schema/Extensions/Nodes/VGO_GameObject.cs

@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------
 // @Namespace : UniGLTFforUniVgo
-// @Class     : glTFNode_VGO_GameObject
+// @Class     : VGO_GameObject
 // ----------------------------------------------------------------------
 namespace UniGLTFforUniVgo
 {
@@ -15,7 +15,7 @@ namespace UniGLTFforUniVgo
     /// </summary>
     [Serializable]
     [JsonObject("node.vgo.gameobject")]
-    public class glTFNode_VGO_GameObject
+    public class VGO_GameObject
     {
         /// <summary>Is Active</summary>
         [JsonProperty("isActive", DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]

UniGLTFforUniVgo/Runtime/Schema/Extensions/glTFNode_VGO_Light.cs → UniGLTFforUniVgo/Runtime/Schema/Extensions/Nodes/VGO_Light.cs

@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------
 // @Namespace : UniGLTFforUniVgo
-// @Class     : glTFNode_VGO_Light
+// @Class     : VGO_Light
 // ----------------------------------------------------------------------
 namespace UniGLTFforUniVgo
 {
@@ -14,7 +14,7 @@ namespace UniGLTFforUniVgo
     /// glTF Node VGO Light
     /// </summary>
     [Serializable]
-    public class glTFNode_VGO_Light
+    public class VGO_Light
     {
         /// <summary>Enabled</summary>
         [JsonProperty("enabled", DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]

UniGLTFforUniVgo/Runtime/Schema/Extensions/glTFNode_VGO_Rigidbody.cs → UniGLTFforUniVgo/Runtime/Schema/Extensions/Nodes/VGO_Rigidbody.cs

@@ -1,6 +1,6 @@
 // ----------------------------------------------------------------------
 // @Namespace : UniGLTFforUniVgo
-// @Class     : glTFNode_VGO_Rigidbody
+// @Class     : VGO_Rigidbody
 // ----------------------------------------------------------------------
 namespace UniGLTFforUniVgo
 {
@@ -14,7 +14,7 @@ namespace UniGLTFforUniVgo
     /// </summary>
     [Serializable]
     [JsonObject("node.vgo.rigidbody")]
-    public class glTFNode_VGO_Rigidbody
+    public class VGO_Rigidbody
     {
         /// <summary>Mass</summary>
         [JsonProperty("mass")]