From 612e04c8e1f0582dc6aeac7f80e6ba45a0ae4340 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Thu, 19 Sep 2024 15:06:08 +0900 Subject: [PATCH] rename. prefix to `Vrm0x` --- Assets/VRM/Runtime/IO/VRMImporterContext.cs | 6 +++--- Assets/VRM/Runtime/IO/VrmUtility.cs | 2 +- ...IVRM0SpringBoneRuntime.cs => IVrm0xSpringBoneRuntime.cs} | 2 +- ...gBoneRuntime.cs.meta => IVrm0xSpringBoneRuntime.cs.meta} | 0 ...stSpringBoneRuntime.cs => Vrm0xFastSpringBoneRuntime.cs} | 2 +- ...neRuntime.cs.meta => Vrm0xFastSpringBoneRuntime.cs.meta} | 0 ...neDefaultRuntime.cs => Vrm0xSpringBoneDefaultRuntime.cs} | 2 +- ...untime.cs.meta => Vrm0xSpringBoneDefaultRuntime.cs.meta} | 0 Assets/VRM_Samples/SimpleViewer/ViewerUI.cs | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) rename Assets/VRM/Runtime/SpringBone/{IVRM0SpringBoneRuntime.cs => IVrm0xSpringBoneRuntime.cs} (79%) rename Assets/VRM/Runtime/SpringBone/{IVRM0SpringBoneRuntime.cs.meta => IVrm0xSpringBoneRuntime.cs.meta} (100%) rename Assets/VRM/Runtime/SpringBone/Jobs/{FastSpringBoneRuntime.cs => Vrm0xFastSpringBoneRuntime.cs} (95%) rename Assets/VRM/Runtime/SpringBone/Jobs/{FastSpringBoneRuntime.cs.meta => Vrm0xFastSpringBoneRuntime.cs.meta} (100%) rename Assets/VRM/Runtime/SpringBone/{VRMSpringBoneDefaultRuntime.cs => Vrm0xSpringBoneDefaultRuntime.cs} (90%) rename Assets/VRM/Runtime/SpringBone/{VRMSpringBoneDefaultRuntime.cs.meta => Vrm0xSpringBoneDefaultRuntime.cs.meta} (100%) diff --git a/Assets/VRM/Runtime/IO/VRMImporterContext.cs b/Assets/VRM/Runtime/IO/VRMImporterContext.cs index db742f42ca..fdd818bf82 100644 --- a/Assets/VRM/Runtime/IO/VRMImporterContext.cs +++ b/Assets/VRM/Runtime/IO/VRMImporterContext.cs @@ -20,7 +20,7 @@ public VRM.glTF_VRM_extensions VRM } } - IVRM0SpringBoneRuntime _springBoneRuntime; + IVrm0xSpringBoneRuntime _springBoneRuntime; public VRMImporterContext( VRMData data, @@ -28,12 +28,12 @@ public VRMImporterContext( ITextureDeserializer textureDeserializer = null, IMaterialDescriptorGenerator materialGenerator = null, ImporterContextSettings settings = null, - IVRM0SpringBoneRuntime springboneRuntime = null) + IVrm0xSpringBoneRuntime springboneRuntime = null) : base(data.Data, externalObjectMap, textureDeserializer, materialGenerator ?? VrmMaterialDescriptorGeneratorUtility.GetValidVrmMaterialDescriptorGenerator(data.VrmExtension), settings ?? new ImporterContextSettings(false)) { _data = data; TextureDescriptorGenerator = new VrmTextureDescriptorGenerator(Data, VRM); - _springBoneRuntime = springboneRuntime ?? new VRMSpringBoneDefaultRuntime(); + _springBoneRuntime = springboneRuntime ?? new Vrm0xSpringBoneDefaultRuntime(); } #region OnLoad diff --git a/Assets/VRM/Runtime/IO/VrmUtility.cs b/Assets/VRM/Runtime/IO/VrmUtility.cs index dfcd3ae4b5..d1385ce7f4 100644 --- a/Assets/VRM/Runtime/IO/VrmUtility.cs +++ b/Assets/VRM/Runtime/IO/VrmUtility.cs @@ -74,7 +74,7 @@ public static async Task LoadBytesAsync(string path, MetaCallback metaCallback = null, ITextureDeserializer textureDeserializer = null, bool loadAnimation = false, - IVRM0SpringBoneRuntime springboneRuntime = null + IVrm0xSpringBoneRuntime springboneRuntime = null ) { if (bytes == null) diff --git a/Assets/VRM/Runtime/SpringBone/IVRM0SpringBoneRuntime.cs b/Assets/VRM/Runtime/SpringBone/IVrm0xSpringBoneRuntime.cs similarity index 79% rename from Assets/VRM/Runtime/SpringBone/IVRM0SpringBoneRuntime.cs rename to Assets/VRM/Runtime/SpringBone/IVrm0xSpringBoneRuntime.cs index 814f90b1a7..0cd583cc2b 100644 --- a/Assets/VRM/Runtime/SpringBone/IVRM0SpringBoneRuntime.cs +++ b/Assets/VRM/Runtime/SpringBone/IVrm0xSpringBoneRuntime.cs @@ -4,7 +4,7 @@ namespace VRM { - public interface IVRM0SpringBoneRuntime + public interface IVrm0xSpringBoneRuntime { public Task InitializeAsync(GameObject vrm, IAwaitCaller awaitCaller); } diff --git a/Assets/VRM/Runtime/SpringBone/IVRM0SpringBoneRuntime.cs.meta b/Assets/VRM/Runtime/SpringBone/IVrm0xSpringBoneRuntime.cs.meta similarity index 100% rename from Assets/VRM/Runtime/SpringBone/IVRM0SpringBoneRuntime.cs.meta rename to Assets/VRM/Runtime/SpringBone/IVrm0xSpringBoneRuntime.cs.meta diff --git a/Assets/VRM/Runtime/SpringBone/Jobs/FastSpringBoneRuntime.cs b/Assets/VRM/Runtime/SpringBone/Jobs/Vrm0xFastSpringBoneRuntime.cs similarity index 95% rename from Assets/VRM/Runtime/SpringBone/Jobs/FastSpringBoneRuntime.cs rename to Assets/VRM/Runtime/SpringBone/Jobs/Vrm0xFastSpringBoneRuntime.cs index 79e9c23e7d..765e7433f2 100644 --- a/Assets/VRM/Runtime/SpringBone/Jobs/FastSpringBoneRuntime.cs +++ b/Assets/VRM/Runtime/SpringBone/Jobs/Vrm0xFastSpringBoneRuntime.cs @@ -14,7 +14,7 @@ namespace VRM /// FastSpringBoneService に登録します。 /// FastSpringBoneService.LateUpdate[DefaultExecutionOrder(11000)] で動作します。 /// - public class FastSpringboneRuntime : IVRM0SpringBoneRuntime + public class Vrm0xFastSpringboneRuntime : IVrm0xSpringBoneRuntime { public async Task InitializeAsync(GameObject vrm, IAwaitCaller awaitCaller) { diff --git a/Assets/VRM/Runtime/SpringBone/Jobs/FastSpringBoneRuntime.cs.meta b/Assets/VRM/Runtime/SpringBone/Jobs/Vrm0xFastSpringBoneRuntime.cs.meta similarity index 100% rename from Assets/VRM/Runtime/SpringBone/Jobs/FastSpringBoneRuntime.cs.meta rename to Assets/VRM/Runtime/SpringBone/Jobs/Vrm0xFastSpringBoneRuntime.cs.meta diff --git a/Assets/VRM/Runtime/SpringBone/VRMSpringBoneDefaultRuntime.cs b/Assets/VRM/Runtime/SpringBone/Vrm0xSpringBoneDefaultRuntime.cs similarity index 90% rename from Assets/VRM/Runtime/SpringBone/VRMSpringBoneDefaultRuntime.cs rename to Assets/VRM/Runtime/SpringBone/Vrm0xSpringBoneDefaultRuntime.cs index 8c805ee21c..57e4acc058 100644 --- a/Assets/VRM/Runtime/SpringBone/VRMSpringBoneDefaultRuntime.cs +++ b/Assets/VRM/Runtime/SpringBone/Vrm0xSpringBoneDefaultRuntime.cs @@ -11,7 +11,7 @@ namespace VRM /// /// により、各VRMSpringBoneが自力で LateUpdate に動作します。 /// - public class VRMSpringBoneDefaultRuntime : IVRM0SpringBoneRuntime + public class Vrm0xSpringBoneDefaultRuntime : IVrm0xSpringBoneRuntime { public async Task InitializeAsync(GameObject vrm, IAwaitCaller awaitCaller) { diff --git a/Assets/VRM/Runtime/SpringBone/VRMSpringBoneDefaultRuntime.cs.meta b/Assets/VRM/Runtime/SpringBone/Vrm0xSpringBoneDefaultRuntime.cs.meta similarity index 100% rename from Assets/VRM/Runtime/SpringBone/VRMSpringBoneDefaultRuntime.cs.meta rename to Assets/VRM/Runtime/SpringBone/Vrm0xSpringBoneDefaultRuntime.cs.meta diff --git a/Assets/VRM_Samples/SimpleViewer/ViewerUI.cs b/Assets/VRM_Samples/SimpleViewer/ViewerUI.cs index 1e40164cad..b70f2f6c3e 100644 --- a/Assets/VRM_Samples/SimpleViewer/ViewerUI.cs +++ b/Assets/VRM_Samples/SimpleViewer/ViewerUI.cs @@ -395,7 +395,7 @@ public async Task LoadBytesAsync(string path, byte[] bytes) var instance = await VrmUtility.LoadBytesAsync(path, bytes, GetIAwaitCaller(m_useAsync.isOn), materialCallback, metaCallback, loadAnimation: m_loadAnimation.isOn, - springboneRuntime: m_useFastSpringBone.isOn ? new FastSpringboneRuntime() : new VRMSpringBoneDefaultRuntime() + springboneRuntime: m_useFastSpringBone.isOn ? new Vrm0xFastSpringboneRuntime() : new Vrm0xSpringBoneDefaultRuntime() ); instance.EnableUpdateWhenOffscreen();