Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-04-25 07:28:51 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

VRMVersionをリネームして場所移動。VRM10から参照できるようになる。 assets.generator に使う。

Browse Source
This commit is contained in:
ousttrue 2023-10-20 18:05:43 +09:00
parent 3b08cccc06
commit 443e0048bd
16 changed files with 36 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.vscode/settings.json vendored
View File

@ -53,6 +53,7 @@
"Temp/":true
},
"cSpell.words": [
"GLTF",
"UNIVRM"
]
}

2
Assets/UniGLTF/Runtime/UniGLTF/Format/glTFAssets.cs
View File

@ -6,7 +6,7 @@ namespace UniGLTF
[Serializable]
public class glTFAssets
{
public string generator;
public string generator = $"UniVRM-{UniVrmPackageVersion.VERSION}";
[JsonSchema(Required = true, Pattern = "^[0-9]+\\.[0-9]+$")]
public string version;

4
Assets/VRM/Runtime/Format/VRMVersion.cs → Assets/UniGLTF/Runtime/UniGLTF/UniVrmPackageVersion.cs
View File

@ -1,7 +1,7 @@
namespace VRM
namespace UniGLTF
{
public static partial class VRMVersion
public static partial class UniVrmPackageVersion
{
public const int MAJOR = 0;
public const int MINOR = 115;

4
Assets/VRM/Runtime/Format/VRMVersion.cs.meta → Assets/UniGLTF/Runtime/UniGLTF/UniVrmPackageVersion.cs.meta
View File

@ -1,7 +1,5 @@
fileFormatVersion: 2
guid: 93c46c8b64555f14bada9f5bb0b7761a
timeCreated: 1522130257
licenseType: Free
guid: 4769e8b6530fee0459f0b415a1444ed8
MonoImporter:
externalObjects: {}
serializedVersion: 2

4
Assets/VRM/Runtime/Format/VRMVersionPartial.cs → Assets/UniGLTF/Runtime/UniGLTF/UniVrmPackageVersionPartial.cs
View File

@ -1,9 +1,9 @@
using System;
using System.Text.RegularExpressions;
namespace VRM
namespace UniGLTF
{
public static partial class VRMVersion
public static partial class UniVrmPackageVersion
{
/// <summary>
/// Returns true if a passed version is newer than current UniVRM.

4
Assets/VRM/Runtime/Format/VRMVersionPartial.cs.meta → Assets/UniGLTF/Runtime/UniGLTF/UniVrmPackageVersionPartial.cs.meta
View File

@ -1,7 +1,5 @@
fileFormatVersion: 2
guid: 4ab9ac9856a4d4c4aa652c07c5b496e6
timeCreated: 1522130257
licenseType: Free
guid: ae6336d2e58d3c94884d2c40bd910bef
MonoImporter:
externalObjects: {}
serializedVersion: 2

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

@ -40,11 +40,11 @@ namespace UniGLTF
/// <summary>
/// VRM
/// </summary>
const string VrmVersionPath = "Assets/VRM/Runtime/Format/VRMVersion.cs";
const string VrmVersionPath = "Assets/UniGLTF/Runtime/UniGLTF/UniVrmPackageVersion.cs";
const string VrmVersionTemplate = @"
namespace VRM
namespace UniGLTF
{{
public static partial class VRMVersion
public static partial class UniVrmPackageVersion
{{
public const int MAJOR = {0};
public const int MINOR = {1};
@ -251,7 +251,7 @@ namespace VRM
void OnGUI()
{
GUILayout.Label("VRM");
GUILayout.Label($"Current version: {VRMVersion.VERSION}");
GUILayout.Label($"Current version: {UniVrmPackageVersion.VERSION}");
m_vrmVersion = EditorGUILayout.TextField("Major.Minor.Patch", m_vrmVersion);
GUILayout.Space(30);
@ -324,7 +324,7 @@ namespace VRM
public static void ShowVersionDialog()
{
var window = ScriptableObject.CreateInstance<VRMVersionMenu>();
window.m_vrmVersion = VRMVersion.VERSION;
window.m_vrmVersion = UniVrmPackageVersion.VERSION;
// window.m_uniGltfVersion = UniGLTFVersion.VERSION;
window.ShowUtility();
}

2
Assets/VRM/Editor/Meta/VRMMetaObjectEditor.cs
View File

@ -176,7 +176,7 @@ namespace VRM
{
serializedObject.Update();
if (VRMVersion.IsNewer(m_exporterVersion.stringValue))
if (UniVrmPackageVersion.IsNewer(m_exporterVersion.stringValue))
{
// モデルのバージョンが、ライブラリのバージョンより新しい
EditorGUILayout.HelpBox("Check UniVRM new version.", MessageType.Warning);

2
Assets/VRM/Editor/VRMExportUnityPackage.cs
View File

@ -73,7 +73,7 @@ namespace VRM.DevOnly.PackageExporter
var path = string.Format("{0}/{1}-{2}_{3}.unitypackage",
folder,
prefix,
VRMVersion.VERSION,
UniGLTF.UniVrmPackageVersion.VERSION,
GetGitHash(Application.dataPath + "/VRM").Substring(0, 4)
).Replace("\\", "/");

8
Assets/VRM/Editor/VrmTopMenu.cs
View File

@ -6,13 +6,13 @@ namespace VRM
{
public static class VrmTopMenu
{
private const string UserMenuPrefix = VRMVersion.MENU;
private const string DevelopmentMenuPrefix = VRMVersion.MENU + "/Development";
private const string UserMenuPrefix = UniVrmPackageVersion.MENU;
private const string DevelopmentMenuPrefix = UniVrmPackageVersion.MENU + "/Development";
[MenuItem(UserMenuPrefix + "/Version: " + VRMVersion.VRM_VERSION, validate = true)]
[MenuItem(UserMenuPrefix + "/Version: " + UniVrmPackageVersion.VRM_VERSION, validate = true)]
private static bool ShowVersionValidation() => false;
[MenuItem(UserMenuPrefix + "/Version: " + VRMVersion.VRM_VERSION, priority = 0)]
[MenuItem(UserMenuPrefix + "/Version: " + UniVrmPackageVersion.VRM_VERSION, priority = 0)]
private static void ShowVersion() { }
[MenuItem(UserMenuPrefix + "/Export to VRM 0.x", priority = 1)]

4
Assets/VRM/Runtime/Format/glTF_VRM_extensions.cs
View File

@ -15,8 +15,8 @@ VRM extension is for 3d humanoid avatars (and models) in VR applications.
public static readonly Utf8String ExtensionNameUtf8 = Utf8String.From(ExtensionName);
[JsonSchema(Description = @"Version of exporter that vrm created. " + VRMVersion.VRM_VERSION)]
public string exporterVersion = "UniVRM-" + VRMVersion.VERSION;
[JsonSchema(Description = @"Version of exporter that vrm created. " + UniVrmPackageVersion.VRM_VERSION)]
public string exporterVersion = "UniVRM-" + UniVrmPackageVersion.VERSION;
[JsonSchema(Description = @"Version of VRM specification. " + VRMSpecVersion.VERSION)]
public string specVersion = VRMSpecVersion.Version;

14
Assets/VRM/Runtime/IO/VRMData.cs
View File

@ -22,10 +22,10 @@ namespace VRM
private static void UpdateMigrationFlags(MigrationFlags migrationFlags, string exportedVrmVersionString)
{
if (!VRMVersion.ParseVersion(exportedVrmVersionString, out var exportedVrmVersion)) return;
if (!UniVrmPackageVersion.ParseVersion(exportedVrmVersionString, out var exportedVrmVersion)) return;
migrationFlags.IsBaseColorFactorGamma = VRMVersion.IsNewer(
new VRMVersion.Version
migrationFlags.IsBaseColorFactorGamma = UniVrmPackageVersion.IsNewer(
new UniVrmPackageVersion.Version
{
Major = 0,
Minor = 54,
@ -35,8 +35,8 @@ namespace VRM
exportedVrmVersion
);
migrationFlags.IsRoughnessTextureValueSquared = VRMVersion.IsNewer(
new VRMVersion.Version
migrationFlags.IsRoughnessTextureValueSquared = UniVrmPackageVersion.IsNewer(
new UniVrmPackageVersion.Version
{
Major = 0,
Minor = 69,
@ -45,8 +45,8 @@ namespace VRM
},
exportedVrmVersion
);
migrationFlags.IsEmissiveFactorGamma = VRMVersion.IsNewer(
new VRMVersion.Version
migrationFlags.IsEmissiveFactorGamma = UniVrmPackageVersion.IsNewer(
new UniVrmPackageVersion.Version
{
Major = 0,
Minor = 107,

2
Assets/VRM/Samples~/SimpleViewer/ViewerUI.cs
View File

@ -253,7 +253,7 @@ namespace VRM.SimpleViewer
private void Start()
{
m_version.text = string.Format("VRMViewer {0}.{1}",
VRMVersion.MAJOR, VRMVersion.MINOR);
UniVrmPackageVersion.MAJOR, UniVrmPackageVersion.MINOR);
m_open.onClick.AddListener(OnOpenClicked);
m_useFastSpringBone.onValueChanged.AddListener(OnUseFastSpringBoneValueChanged);
OnUseFastSpringBoneValueChanged(m_useFastSpringBone.isOn);

15
Assets/VRM/Tests/VersionTests.cs
View File

@ -1,22 +1,17 @@
using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.Linq;
using UniJSON;
using UnityEngine;
namespace VRM
{
public class UniVRMVersionTests
{
[Test]
[TestCase(VRMVersion.VERSION, false)]
[TestCase(UniGLTF.UniVrmPackageVersion.VERSION, false)]
[TestCase("0.199", true)]
[TestCase("0.199.0", true)]
[TestCase("1.0.0", true)]
public void IsNewerTest(string newer, bool isNewer)
{
Assert.AreEqual(isNewer, VRMVersion.IsNewer(newer));
Assert.AreEqual(isNewer, UniGLTF.UniVrmPackageVersion.IsNewer(newer));
}
[Test]
@ -31,7 +26,7 @@ namespace VRM
[TestCase("1.0.0", "0.51.0", true)]
public void IsNewerTest(string newer, string older, bool isNewer)
{
Assert.AreEqual(isNewer, VRMVersion.IsNewer(newer, older));
Assert.AreEqual(isNewer, UniGLTF.UniVrmPackageVersion.IsNewer(newer, older));
}
[Test]
@ -43,8 +38,8 @@ namespace VRM
[TestCase("aaaaa", false, 0, 0, 0, "")]
public void ParseVersionTest(string version, bool canBeParsed, int major, int minor, int patch, string pre)
{
VRMVersion.Version v;
var res = VRMVersion.ParseVersion(version, out v);
UniGLTF.UniVrmPackageVersion.Version v;
var res = UniGLTF.UniVrmPackageVersion.ParseVersion(version, out v);
Assert.AreEqual(canBeParsed, res);
if (res)
{

2
Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs
View File

@ -310,7 +310,7 @@ namespace UniVRM10.VRM10Viewer
private void Start()
{
m_version.text = string.Format("VRMViewer {0}.{1}",
VRMVersion.MAJOR, VRMVersion.MINOR);
VRM10SpecVersion.MAJOR, VRM10SpecVersion.MINOR);
m_openModel.onClick.AddListener(OnOpenModelClicked);
m_openMotion.onClick.AddListener(OnOpenMotionClicked);

2
Assets/VRM_Samples/SimpleViewer/ViewerUI.cs
View File

@ -253,7 +253,7 @@ namespace VRM.SimpleViewer
private void Start()
{
m_version.text = string.Format("VRMViewer {0}.{1}",
VRMVersion.MAJOR, VRMVersion.MINOR);
UniVrmPackageVersion.MAJOR, UniVrmPackageVersion.MINOR);
m_open.onClick.AddListener(OnOpenClicked);
m_useFastSpringBone.onValueChanged.AddListener(OnUseFastSpringBoneValueChanged);
OnUseFastSpringBoneValueChanged(m_useFastSpringBone.isOn);