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

rename UniVrmPackageVersion to PackageVersion

Browse Source
This commit is contained in:
ousttrue 2023-10-20 19:16:20 +09:00
parent 372f8869a6
commit 8ff3faa857
14 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/UniGLTF/Runtime/UniGLTF/UniVrmPackageVersion.cs → Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs
View File

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

2
Assets/UniGLTF/Runtime/UniGLTF/UniVrmPackageVersion.cs.meta → Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 4769e8b6530fee0459f0b415a1444ed8
guid: ab81045d7751d4040b553ecbac5ab9e4
MonoImporter:
externalObjects: {}
serializedVersion: 2

2
Assets/UniGLTF/Runtime/UniGLTF/UniVrmPackageVersionPartial.cs → Assets/UniGLTF/Runtime/UniGLTF/PackageVersionPartial.cs
View File

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

2
Assets/UniGLTF/Runtime/UniGLTF/UniVrmPackageVersionPartial.cs.meta → Assets/UniGLTF/Runtime/UniGLTF/PackageVersionPartial.cs.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: ae6336d2e58d3c94884d2c40bd910bef
guid: a025b7dc17054bb41ae56d364d78d120
MonoImporter:
externalObjects: {}
serializedVersion: 2

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

@ -40,11 +40,11 @@ namespace UniGLTF
/// <summary>
/// VRM
/// </summary>
const string VrmVersionPath = "Assets/UniGLTF/Runtime/UniGLTF/UniVrmPackageVersion.cs";
const string VrmVersionPath = "Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs";
const string VrmVersionTemplate = @"
namespace UniGLTF
{{
public static partial class UniVrmPackageVersion
public static partial class PackageVersion
{{
public const int MAJOR = {0};
public const int MINOR = {1};
@ -251,7 +251,7 @@ namespace UniGLTF
void OnGUI()
{
GUILayout.Label("VRM");
GUILayout.Label($"Current version: {UniVrmPackageVersion.VERSION}");
GUILayout.Label($"Current version: {PackageVersion.VERSION}");
m_vrmVersion = EditorGUILayout.TextField("Major.Minor.Patch", m_vrmVersion);
GUILayout.Space(30);
@ -324,7 +324,7 @@ namespace UniGLTF
public static void ShowVersionDialog()
{
var window = ScriptableObject.CreateInstance<VRMVersionMenu>();
window.m_vrmVersion = UniVrmPackageVersion.VERSION;
window.m_vrmVersion = PackageVersion.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 (UniVrmPackageVersion.IsNewer(m_exporterVersion.stringValue))
if (PackageVersion.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,
UniGLTF.UniVrmPackageVersion.VERSION,
UniGLTF.PackageVersion.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 = UniVrmPackageVersion.MENU;
private const string DevelopmentMenuPrefix = UniVrmPackageVersion.MENU + "/Development";
private const string UserMenuPrefix = PackageVersion.MENU;
private const string DevelopmentMenuPrefix = PackageVersion.MENU + "/Development";
[MenuItem(UserMenuPrefix + "/Version: " + UniVrmPackageVersion.VRM_VERSION, validate = true)]
[MenuItem(UserMenuPrefix + "/Version: " + PackageVersion.VRM_VERSION, validate = true)]
private static bool ShowVersionValidation() => false;
[MenuItem(UserMenuPrefix + "/Version: " + UniVrmPackageVersion.VRM_VERSION, priority = 0)]
[MenuItem(UserMenuPrefix + "/Version: " + PackageVersion.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. " + UniVrmPackageVersion.VRM_VERSION)]
public string exporterVersion = "UniVRM-" + UniVrmPackageVersion.VERSION;
[JsonSchema(Description = @"Version of exporter that vrm created. " + PackageVersion.VRM_VERSION)]
public string exporterVersion = "UniVRM-" + PackageVersion.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 (!UniVrmPackageVersion.ParseVersion(exportedVrmVersionString, out var exportedVrmVersion)) return;
if (!PackageVersion.ParseVersion(exportedVrmVersionString, out var exportedVrmVersion)) return;
migrationFlags.IsBaseColorFactorGamma = UniVrmPackageVersion.IsNewer(
new UniVrmPackageVersion.Version
migrationFlags.IsBaseColorFactorGamma = PackageVersion.IsNewer(
new PackageVersion.Version
{
Major = 0,
Minor = 54,
@ -35,8 +35,8 @@ namespace VRM
exportedVrmVersion
);
migrationFlags.IsRoughnessTextureValueSquared = UniVrmPackageVersion.IsNewer(
new UniVrmPackageVersion.Version
migrationFlags.IsRoughnessTextureValueSquared = PackageVersion.IsNewer(
new PackageVersion.Version
{
Major = 0,
Minor = 69,
@ -45,8 +45,8 @@ namespace VRM
},
exportedVrmVersion
);
migrationFlags.IsEmissiveFactorGamma = UniVrmPackageVersion.IsNewer(
new UniVrmPackageVersion.Version
migrationFlags.IsEmissiveFactorGamma = PackageVersion.IsNewer(
new PackageVersion.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}",
UniVrmPackageVersion.MAJOR, UniVrmPackageVersion.MINOR);
PackageVersion.MAJOR, PackageVersion.MINOR);
m_open.onClick.AddListener(OnOpenClicked);
m_useFastSpringBone.onValueChanged.AddListener(OnUseFastSpringBoneValueChanged);
OnUseFastSpringBoneValueChanged(m_useFastSpringBone.isOn);

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

@ -5,13 +5,13 @@ namespace VRM
public class UniVRMVersionTests
{
[Test]
[TestCase(UniGLTF.UniVrmPackageVersion.VERSION, false)]
[TestCase(UniGLTF.PackageVersion.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, UniGLTF.UniVrmPackageVersion.IsNewer(newer));
Assert.AreEqual(isNewer, UniGLTF.PackageVersion.IsNewer(newer));
}
[Test]
@ -26,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, UniGLTF.UniVrmPackageVersion.IsNewer(newer, older));
Assert.AreEqual(isNewer, UniGLTF.PackageVersion.IsNewer(newer, older));
}
[Test]
@ -38,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)
{
UniGLTF.UniVrmPackageVersion.Version v;
var res = UniGLTF.UniVrmPackageVersion.ParseVersion(version, out v);
UniGLTF.PackageVersion.Version v;
var res = UniGLTF.PackageVersion.ParseVersion(version, out v);
Assert.AreEqual(canBeParsed, res);
if (res)
{

2
Assets/VRM10/vrmlib/Runtime/Model.cs
View File

@ -25,7 +25,7 @@ namespace VrmLib
public Coordinates Coordinates;
public string AssetVersion = "2.0";
public string AssetGenerator = $"UniVRM-{UniVrmPackageVersion.VERSION}";
public string AssetGenerator = $"UniVRM-{PackageVersion.VERSION}";
public string AssetCopyright;
public string AssetMinVersion;

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}",
UniVrmPackageVersion.MAJOR, UniVrmPackageVersion.MINOR);
PackageVersion.MAJOR, PackageVersion.MINOR);
m_open.onClick.AddListener(OnOpenClicked);
m_useFastSpringBone.onValueChanged.AddListener(OnUseFastSpringBoneValueChanged);
OnUseFastSpringBoneValueChanged(m_useFastSpringBone.isOn);