Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-10-01 15:22:53 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #809 from ousttrue/version/0_69_0

Browse Source 
Version/0 69 0
This commit is contained in:
PoChang007
2021-03-21 18:39:19 -09:00
committed by GitHub
parent b6cc2265df 59fbfe03b5
commit b40c65d98b
6 changed files with 71 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs
View File

@@ -4,8 +4,8 @@ namespace UniGLTF
public static partial class UniGLTFVersion
{
public const int MAJOR = 2;
public const int MINOR = 4;
public const int PATCH = 2;
public const string VERSION = "2.4.2";
public const int MINOR = 5;
public const int PATCH = 0;
public const string VERSION = "2.5.0";
}
}

4
Assets/UniGLTF/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "com.vrmc.unigltf",
"version": "2.4.2",
"version": "2.5.0",
"displayName": "UniGLTF",
"description": "GLTF importer and exporter",
"unity": "2018.4",
@@ -11,6 +11,6 @@
"name": "VRM Consortium"
},
"dependencies": {
"com.vrmc.vrmshaders": "0.68.2"
"com.vrmc.vrmshaders": "0.69.0"
}
}

89
Assets/VRM/Editor/Format/VRMVersionMenu.cs
View File

@@ -3,9 +3,20 @@ using System.Text;
using UnityEditor;
using UnityEngine;
using UniGLTF;
using System;
namespace VRM
{
/// <summary>
/// VersionDialog
///
/// UniGLTFVersion は、 VRMVersion から自動的に決まる。
///
/// Major = 2
/// Minor = VRMVersion.MINOR - 64
/// Patch = VRMVersion.PATCH
///
/// </summary>
public class VRMVersionMenu : EditorWindow
{
/// <summary>
@@ -120,30 +131,50 @@ namespace VRM
[SerializeField]
string m_vrmVersion;
[SerializeField]
string m_uniGltfVersion;
(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)
{
if (string.IsNullOrEmpty(src))
try
{
if (string.IsNullOrEmpty(src))
{
version = default;
return false;
}
var splitted = src.Split('.');
if (splitted.Length != 3)
{
version = default;
return false;
}
version = (
int.Parse(splitted[0]),
int.Parse(splitted[1]),
int.Parse(splitted[2])
);
return true;
}
catch (Exception)
{
version = default;
return false;
}
var splitted = src.Split('.');
if (splitted.Length != 3)
{
version = default;
return false;
}
version = (
int.Parse(splitted[0]),
int.Parse(splitted[1]),
int.Parse(splitted[2])
);
return true;
}
/// <summary>
@@ -158,24 +189,22 @@ namespace VRM
GUILayout.Label("UniGLTF");
GUILayout.Label($"Current version: {UniGLTFVersion.VERSION}");
m_uniGltfVersion = EditorGUILayout.TextField("Major.Minor.Patch", m_uniGltfVersion);
{
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))
{
if (TryGetVersion(m_uniGltfVersion, out (int, int, int) uniGltfVersion))
{
UpdateVrmVersion(uniGltfVersion, vrmVersion);
UpdateUniGLTFVersion(uniGltfVersion, vrmVersion);
AssetDatabase.Refresh();
Debug.Log($"{uniGltfVersion}, {vrmVersion}");
}
else
{
Debug.LogWarning($"InvalidFormat: {m_uniGltfVersion}");
}
UpdateVrmVersion(m_uniGltfVersion, vrmVersion);
UpdateUniGLTFVersion(m_uniGltfVersion, vrmVersion);
AssetDatabase.Refresh();
Debug.Log($"{m_uniGltfVersion}, {vrmVersion}");
}
else
{
@@ -228,7 +257,7 @@ namespace VRM
{
var window = ScriptableObject.CreateInstance<VRMVersionMenu>();
window.m_vrmVersion = VRMVersion.VERSION;
window.m_uniGltfVersion = UniGLTFVersion.VERSION;
// window.m_uniGltfVersion = UniGLTFVersion.VERSION;
window.ShowUtility();
}
}

6
Assets/VRM/Runtime/Format/VRMVersion.cs
View File

@@ -4,8 +4,8 @@ namespace VRM
public static partial class VRMVersion
{
public const int MAJOR = 0;
public const int MINOR = 68;
public const int PATCH = 2;
public const string VERSION = "0.68.2";
public const int MINOR = 69;
public const int PATCH = 0;
public const string VERSION = "0.69.0";
}
}

6
Assets/VRM/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "com.vrmc.univrm",
"version": "0.68.2",
"version": "0.69.0",
"displayName": "VRM",
"description": "VRM importer",
"unity": "2018.4",
@@ -14,7 +14,7 @@
"name": "VRM Consortium"
},
"dependencies": {
"com.vrmc.vrmshaders": "0.68.2",
"com.vrmc.unigltf": "2.4.2"
"com.vrmc.vrmshaders": "0.69.0",
"com.vrmc.unigltf": "2.5.0"
}
}

2
Assets/VRMShaders/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "com.vrmc.vrmshaders",
"version": "0.68.2",
"version": "0.69.0",
"displayName": "VRM Shaders",
"description": "VRM Shaders",
"unity": "2018.4",