diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporter.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporter.cs
index bb996f84e..cfafbec45 100644
--- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporter.cs
+++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporter.cs
@@ -12,7 +12,7 @@ namespace UniGLTF
{
public override void OnImportAsset(AssetImportContext ctx)
{
- Import(this, ctx, m_reverseAxis.ToAxes(), m_useURPMaterial);
+ Import(this, ctx, m_reverseAxis.ToAxes(), m_useUrpMaterial);
}
}
}
diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporter.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporter.cs
index 1a6df70c2..97a08b914 100644
--- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporter.cs
+++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporter.cs
@@ -12,7 +12,7 @@ namespace UniGLTF
{
public override void OnImportAsset(AssetImportContext ctx)
{
- Import(this, ctx, m_reverseAxis.ToAxes(), m_useURPMaterial);
+ Import(this, ctx, m_reverseAxis.ToAxes(), m_useUrpMaterial);
}
}
}
diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterBase.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterBase.cs
index 9ce13fe48..b1bf91d3b 100644
--- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterBase.cs
+++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterBase.cs
@@ -21,13 +21,13 @@ namespace UniGLTF
public ScriptedImporterAxes m_reverseAxis = default;
[SerializeField]
- public bool m_useURPMaterial;
+ public bool m_useUrpMaterial;
- static IMaterialDescriptorGenerator GetMaterialGenerator(bool useURPMaterial)
+ static IMaterialDescriptorGenerator GetMaterialGenerator(bool useUrpMaterial)
{
- if (useURPMaterial)
+ if (useUrpMaterial)
{
- return new GltfURPMaterialDescriptorGenerator();
+ return new GltfUrpMaterialDescriptorGenerator();
}
else
{
@@ -41,7 +41,7 @@ namespace UniGLTF
///
///
///
- protected static void Import(ScriptedImporter scriptedImporter, AssetImportContext context, Axes reverseAxis, bool useURPMaterial)
+ protected static void Import(ScriptedImporter scriptedImporter, AssetImportContext context, Axes reverseAxis, bool useUrpMaterial)
{
#if VRM_DEVELOP
Debug.Log("OnImportAsset to " + scriptedImporter.assetPath);
@@ -62,7 +62,7 @@ namespace UniGLTF
.Where(x => x.Value != null)
.ToDictionary(kv => new SubAssetKey(kv.Value.GetType(), kv.Key.name), kv => kv.Value);
- IMaterialDescriptorGenerator materialGenerator = GetMaterialGenerator(useURPMaterial);
+ IMaterialDescriptorGenerator materialGenerator = GetMaterialGenerator(useUrpMaterial);
using (var loader = new ImporterContext(data, extractedObjects, materialGenerator: materialGenerator))
{
diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ZipArchivedGltfScriptedImporter.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ZipArchivedGltfScriptedImporter.cs
index 719b1995a..0ed65d3f7 100644
--- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ZipArchivedGltfScriptedImporter.cs
+++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ZipArchivedGltfScriptedImporter.cs
@@ -14,7 +14,7 @@ namespace UniGLTF
{
public override void OnImportAsset(AssetImportContext ctx)
{
- Import(this, ctx, m_reverseAxis.ToAxes(), m_useURPMaterial);
+ Import(this, ctx, m_reverseAxis.ToAxes(), m_useUrpMaterial);
}
}
}
diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/GltfPbrURPMaterialImporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/GltfPbrURPMaterialImporter.cs
index 7276126c7..93c8d7a31 100644
--- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/GltfPbrURPMaterialImporter.cs
+++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/GltfPbrURPMaterialImporter.cs
@@ -9,7 +9,7 @@ namespace UniGLTF
///
/// see: https://github.com/Unity-Technologies/Graphics/blob/v7.5.3/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineMaterialUpgrader.cs#L354-L379
///
- public static class GltfPbrURPMaterialImporter
+ public static class GltfPbrUrpMaterialImporter
{
public const string ShaderName = "Universal Render Pipeline/Lit";
diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/GltfURPMaterialDescriptorGenerator.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/GltfURPMaterialDescriptorGenerator.cs
index 479ad31cb..e5422ae9a 100644
--- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/GltfURPMaterialDescriptorGenerator.cs
+++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/GltfURPMaterialDescriptorGenerator.cs
@@ -8,13 +8,13 @@ namespace UniGLTF
///
/// GLTF の MaterialImporter
///
- public sealed class GltfURPMaterialDescriptorGenerator : IMaterialDescriptorGenerator
+ public sealed class GltfUrpMaterialDescriptorGenerator : IMaterialDescriptorGenerator
{
public MaterialDescriptor Get(GltfData data, int i)
{
if (!GltfUnlitMaterialImporter.TryCreateParam(data, i, out var param))
{
- if (!GltfPbrURPMaterialImporter.TryCreateParam(data, i, out param))
+ if (!GltfPbrUrpMaterialImporter.TryCreateParam(data, i, out param))
{
// fallback
#if VRM_DEVELOP
diff --git a/Assets/VRM/Runtime/IO/VRMURPMaterialDescriptorGenerator.cs b/Assets/VRM/Runtime/IO/VRMURPMaterialDescriptorGenerator.cs
index a3661a255..376198d32 100644
--- a/Assets/VRM/Runtime/IO/VRMURPMaterialDescriptorGenerator.cs
+++ b/Assets/VRM/Runtime/IO/VRMURPMaterialDescriptorGenerator.cs
@@ -4,10 +4,10 @@ using VRMShaders;
namespace VRM
{
- public sealed class VRMURPMaterialDescriptorGenerator : IMaterialDescriptorGenerator
+ public sealed class VRMUrpMaterialDescriptorGenerator : IMaterialDescriptorGenerator
{
readonly glTF_VRM_extensions m_vrm;
- public VRMURPMaterialDescriptorGenerator(glTF_VRM_extensions vrm)
+ public VRMUrpMaterialDescriptorGenerator(glTF_VRM_extensions vrm)
{
m_vrm = vrm;
}
@@ -19,7 +19,7 @@ namespace VRM
if (!GltfUnlitMaterialImporter.TryCreateParam(data, i, out MaterialDescriptor matDesc))
{
// pbr "Standard" to "Universal Render Pipeline/Lit"
- if (!GltfPbrURPMaterialImporter.TryCreateParam(data, i, out matDesc))
+ if (!GltfPbrUrpMaterialImporter.TryCreateParam(data, i, out matDesc))
{
// fallback
#if VRM_DEVELOP
diff --git a/Assets/VRM10/Runtime/IO/Material/Vrm10UrpMaterialDescriptorGenerator.cs b/Assets/VRM10/Runtime/IO/Material/Vrm10UrpMaterialDescriptorGenerator.cs
index 2082d1d07..f2844cfbe 100644
--- a/Assets/VRM10/Runtime/IO/Material/Vrm10UrpMaterialDescriptorGenerator.cs
+++ b/Assets/VRM10/Runtime/IO/Material/Vrm10UrpMaterialDescriptorGenerator.cs
@@ -12,7 +12,7 @@ namespace UniVRM10
if (!GltfUnlitMaterialImporter.TryCreateParam(data, i, out MaterialDescriptor matDesc))
{
// pbr
- if (!GltfPbrURPMaterialImporter.TryCreateParam(data, i, out matDesc))
+ if (!GltfPbrUrpMaterialImporter.TryCreateParam(data, i, out matDesc))
{
// fallback
#if VRM_DEVELOP