Merge pull request #1157 from ousttrue/version/v0_81_0

UniVRM-0.81.0
vrm-c · Aug 19, 2021 · 77fa1e2 · 77fa1e2
2 parents f3624e7 + 8e51cef
commit 77fa1e2
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 56 deletions.
diff --git a/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs b/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs
@@ -3,9 +3,9 @@ namespace UniGLTF
 {
     public static partial class UniGLTFVersion
     {
-        public const int MAJOR = 2;
-        public const int MINOR = 16;
+        public const int MAJOR = 0;
+        public const int MINOR = 81;
         public const int PATCH = 0;
-        public const string VERSION = "2.16.0";
+        public const string VERSION = "0.81.0";
     }
 }
diff --git a/Assets/UniGLTF/package.json b/Assets/UniGLTF/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "com.vrmc.unigltf",
-  "version": "2.16.0",
+  "name": "com.vrmc.gltf",
+  "version": "0.81.0",
   "displayName": "UniGLTF",
   "description": "GLTF importer and exporter",
   "unity": "2019.4",
@@ -11,6 +11,6 @@
     "name": "VRM Consortium"
   },
   "dependencies": {
-    "com.vrmc.vrmshaders": "0.80.0"
+    "com.vrmc.vrmshaders": "0.81.0"
   }
 }
diff --git a/Assets/VRM/Editor/Format/VRMVersionMenu.cs b/Assets/VRM/Editor/Format/VRMVersionMenu.cs
@@ -10,11 +10,7 @@ namespace VRM
     /// <summary>
     /// VersionDialog
     /// 
-    /// UniGLTFVersion は、 VRMVersion から自動的に決まる。
-    /// 
-    /// Major = 2
-    /// Minor = VRMVersion.MINOR - 64
-    /// Patch = VRMVersion.PATCH
+    /// v0.81.0: com.vrmc.unigltf to com.vrmc.gltf and same version with univrm.
     /// 
     /// </summary>
     public class VRMVersionMenu : EditorWindow
@@ -163,7 +159,7 @@ public UpmPackage(string path, string template)
 
         UpmPackage UniGLTFPackage = new UpmPackage("Assets/UniGLTF/package.json",
 @"{{
-  ""name"": ""com.vrmc.unigltf"",
+  ""name"": ""com.vrmc.gltf"",
   ""version"": ""{0}"",
   ""displayName"": ""UniGLTF"",
   ""description"": ""GLTF importer and exporter"",
@@ -182,21 +178,6 @@ public UpmPackage(string path, string template)
         [SerializeField]
         string m_vrmVersion;
 
-        (int, int, int) m_uniGltfVersion
-        {
-            get
-            {
-                if (TryGetVersion(m_vrmVersion, out (int, int, int) vrmVersion))
-                {
-                    return (2, vrmVersion.Item2 - 64, vrmVersion.Item3);
-                }
-                else
-                {
-                    return (0, 0, 0);
-                }
-            }
-        }
-
         static bool TryGetVersion(string src, out (int, int, int) version)
         {
             try
@@ -238,24 +219,14 @@ void OnGUI()
             m_vrmVersion = EditorGUILayout.TextField("Major.Minor.Patch", m_vrmVersion);
             GUILayout.Space(30);
 
-            GUILayout.Label("UniGLTF");
-            GUILayout.Label($"Current version: {UniGLTFVersion.VERSION}");
-            {
-                var enabled = GUI.enabled;
-                GUI.enabled = false;
-                EditorGUILayout.TextField("Major.Minor.Patch", $"{m_uniGltfVersion}");
-                GUI.enabled = enabled;
-            }
-            GUILayout.Space(30);
-
             if (GUILayout.Button("Apply"))
             {
                 if (TryGetVersion(m_vrmVersion, out (int, int, int) vrmVersion))
                 {
-                    UpdateVrmVersion(m_uniGltfVersion, vrmVersion);
-                    UpdateUniGLTFVersion(m_uniGltfVersion, vrmVersion);
+                    UpdateVrmVersion(vrmVersion);
+                    UpdateUniGLTFVersion(vrmVersion);
                     AssetDatabase.Refresh();
-                    Debug.Log($"{m_uniGltfVersion}, {vrmVersion}");
+                    Debug.Log($"{vrmVersion}");
                 }
                 else
                 {
@@ -269,21 +240,21 @@ void OnGUI()
             }
         }
 
-        void UpdateUniGLTFVersion((int, int, int) uniGltf, (int, int, int) vrm)
+        void UpdateUniGLTFVersion((int, int, int) vrm)
         {
             var utf8 = new UTF8Encoding(false);
             File.WriteAllText(UniGltfVersionPath, string.Format(UniGltfVersionTemplate,
-                uniGltf.Item1,
-                uniGltf.Item2,
-                uniGltf.Item3), utf8);
+                vrm.Item1,
+                vrm.Item2,
+                vrm.Item3), utf8);
 
             File.WriteAllText(UniGLTFPackage.Path, string.Format(UniGLTFPackage.Template,
-                $"{uniGltf.Item1}.{uniGltf.Item2}.{uniGltf.Item3}",
+                $"{vrm.Item1}.{vrm.Item2}.{vrm.Item3}",
                 $"{vrm.Item1}.{vrm.Item2}.{vrm.Item3}"
                 ), utf8);
         }
 
-        void UpdateVrmVersion((int, int, int) uniGltf, (int, int, int) vrm)
+        void UpdateVrmVersion((int, int, int) vrm)
         {
             // generate
             var utf8 = new UTF8Encoding(false);
@@ -295,7 +266,7 @@ void UpdateVrmVersion((int, int, int) uniGltf, (int, int, int) vrm)
             foreach (var upm in Packages)
             {
                 File.WriteAllText(upm.Path, string.Format(upm.Template,
-                    $"{uniGltf.Item1}.{uniGltf.Item2}.{uniGltf.Item3}",
+                    $"{vrm.Item1}.{vrm.Item2}.{vrm.Item3}",
                     $"{vrm.Item1}.{vrm.Item2}.{vrm.Item3}"
                     ), utf8);
             }

diff --git a/Assets/VRM/Runtime/Format/VRMVersion.cs b/Assets/VRM/Runtime/Format/VRMVersion.cs
@@ -4,8 +4,8 @@ namespace VRM
     public static partial class VRMVersion
     {
         public const int MAJOR = 0;
-        public const int MINOR = 80;
+        public const int MINOR = 81;
         public const int PATCH = 0;
-        public const string VERSION = "0.80.0";
+        public const string VERSION = "0.81.0";
     }
 }
diff --git a/Assets/VRM/package.json b/Assets/VRM/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.vrmc.univrm",
-  "version": "0.80.0",
+  "version": "0.81.0",
   "displayName": "VRM",
   "description": "VRM importer",
   "unity": "2019.4",
@@ -14,8 +14,8 @@
     "name": "VRM Consortium"
   },
   "dependencies": {
-    "com.vrmc.vrmshaders": "0.80.0",
-    "com.vrmc.unigltf": "2.16.0"
+    "com.vrmc.vrmshaders": "0.81.0",
+    "com.vrmc.unigltf": "0.81.0"
   },
   "samples": [
     {

diff --git a/Assets/VRM10/package.json b/Assets/VRM10/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.vrmc.vrm",
-  "version": "0.80.0",
+  "version": "0.81.0",
   "displayName": "VRM-1.0β",
   "description": "VRM-1.0β importer",
   "unity": "2019.4",
@@ -14,8 +14,8 @@
     "name": "VRM Consortium"
   },
   "dependencies": {
-    "com.vrmc.vrmshaders": "0.80.0",
-    "com.vrmc.unigltf": "2.16.0"
+    "com.vrmc.vrmshaders": "0.81.0",
+    "com.vrmc.unigltf": "0.81.0"
   },
   "samples": [
     {

diff --git a/Assets/VRMShaders/package.json b/Assets/VRMShaders/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.vrmc.vrmshaders",
-  "version": "0.80.0",
+  "version": "0.81.0",
   "displayName": "VRM Shaders",
   "description": "VRM Shaders",
   "unity": "2019.4",