Skip to content

Commit

Permalink
rename. prefix to Vrm0x
Browse files Browse the repository at this point in the history
  • Loading branch information
ousttrue committed Sep 19, 2024
1 parent ee3ce66 commit 612e04c
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions Assets/VRM/Runtime/IO/VRMImporterContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@ public VRM.glTF_VRM_extensions VRM
}
}

IVRM0SpringBoneRuntime _springBoneRuntime;
IVrm0xSpringBoneRuntime _springBoneRuntime;

public VRMImporterContext(
VRMData data,
IReadOnlyDictionary<SubAssetKey, Object> externalObjectMap = null,
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
Expand Down
2 changes: 1 addition & 1 deletion Assets/VRM/Runtime/IO/VrmUtility.cs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public static async Task<RuntimeGltfInstance> LoadBytesAsync(string path,
MetaCallback metaCallback = null,
ITextureDeserializer textureDeserializer = null,
bool loadAnimation = false,
IVRM0SpringBoneRuntime springboneRuntime = null
IVrm0xSpringBoneRuntime springboneRuntime = null
)
{
if (bytes == null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace VRM
{
public interface IVRM0SpringBoneRuntime
public interface IVrm0xSpringBoneRuntime
{
public Task InitializeAsync(GameObject vrm, IAwaitCaller awaitCaller);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace VRM
/// FastSpringBoneService に登録します。
/// FastSpringBoneService.LateUpdate[DefaultExecutionOrder(11000)] で動作します。
/// </summary>
public class FastSpringboneRuntime : IVRM0SpringBoneRuntime
public class Vrm0xFastSpringboneRuntime : IVrm0xSpringBoneRuntime
{
public async Task InitializeAsync(GameObject vrm, IAwaitCaller awaitCaller)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace VRM
///
/// により、各VRMSpringBoneが自力で LateUpdate に動作します。
/// </summary>
public class VRMSpringBoneDefaultRuntime : IVRM0SpringBoneRuntime
public class Vrm0xSpringBoneDefaultRuntime : IVrm0xSpringBoneRuntime
{
public async Task InitializeAsync(GameObject vrm, IAwaitCaller awaitCaller)
{
Expand Down
2 changes: 1 addition & 1 deletion Assets/VRM_Samples/SimpleViewer/ViewerUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 612e04c

Please sign in to comment.