Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-11 21:38:56 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rename

Browse Source
This commit is contained in:
Masataka SUMI
2021-05-26 17:28:08 +09:00
parent fda6b14466
commit f1a640be61
9 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfMaterialImporter.cs
View File

@@ -12,15 +12,15 @@ namespace UniGLTF
{
public MaterialImportParam GetMaterialParam(GltfParser parser, int i)
{
if (!GltfUnlitMaterial.TryCreateParam(parser, i, out var param))
if (!GltfUnlitMaterialImporter.TryCreateParam(parser, i, out var param))
{
if (!GltfPBRMaterial.TryCreateParam(parser, i, out param))
if (!GltfPbrMaterialImporter.TryCreateParam(parser, i, out param))
{
// fallback
#if VRM_DEVELOP
Debug.LogWarning($"material: {i} out of range. fallback");
#endif
return new MaterialImportParam(GetMaterialName(i, null), GltfPBRMaterial.ShaderName);
return new MaterialImportParam(GetMaterialName(i, null), GltfPbrMaterialImporter.ShaderName);
}
}

2
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfPBRMaterial.cs → Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfPbrMaterialImporter.cs
View File

@@ -35,7 +35,7 @@ namespace UniGLTF
/// _ZWrite
///
/// </summary>
public static class GltfPBRMaterial
public static class GltfPbrMaterialImporter
{
public const string ShaderName = "Standard";

0
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfPBRMaterial.cs.meta → Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfPbrMaterialImporter.cs.meta
View File

8
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfTextureEnumerator.cs
View File

@@ -38,7 +38,7 @@ namespace UniGLTF
// base color
if (m.pbrMetallicRoughness?.baseColorTexture != null)
{
yield return GltfPBRMaterial.BaseColorTexture(parser, m);
yield return GltfPbrMaterialImporter.BaseColorTexture(parser, m);
}
// metallic roughness
@@ -51,13 +51,13 @@ namespace UniGLTF
// emission
if (m.emissiveTexture != null)
{
yield return GltfPBRMaterial.EmissiveTexture(parser, m);
yield return GltfPbrMaterialImporter.EmissiveTexture(parser, m);
}
// normal
if (m.normalTexture != null)
{
yield return GltfPBRMaterial.NormalTexture(parser, m);
yield return GltfPbrMaterialImporter.NormalTexture(parser, m);
}
// occlusion
@@ -70,7 +70,7 @@ namespace UniGLTF
// metallicSmooth and occlusion
if (metallicRoughnessTexture.HasValue || occlusionTexture.HasValue)
{
yield return GltfPBRMaterial.StandardTexture(parser, m);
yield return GltfPbrMaterialImporter.StandardTexture(parser, m);
}
}

2
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfUnlitMaterial.cs → Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfUnlitMaterialImporter.cs
View File

@@ -4,7 +4,7 @@ using VRMShaders;
namespace UniGLTF
{
public static class GltfUnlitMaterial
public static class GltfUnlitMaterialImporter
{
public const string ShaderName = "UniGLTF/UniUnlit";

0
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfUnlitMaterial.cs.meta → Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfUnlitMaterialImporter.cs.meta
View File

6
Assets/VRM/Runtime/IO/VRMMaterialImporter.cs
View File

@@ -100,16 +100,16 @@ namespace VRM
if (!TryCreateParam(parser, i, out MaterialImportParam param))
{
// unlit
if (!GltfUnlitMaterial.TryCreateParam(parser, i, out param))
if (!GltfUnlitMaterialImporter.TryCreateParam(parser, i, out param))
{
// pbr
if (!GltfPBRMaterial.TryCreateParam(parser, i, out param))
if (!GltfPbrMaterialImporter.TryCreateParam(parser, i, out param))
{
// fallback
#if VRM_DEVELOP
Debug.LogWarning($"material: {i} out of range. fallback");
#endif
return new MaterialImportParam(GltfMaterialImporter.GetMaterialName(i, null), GltfPBRMaterial.ShaderName);
return new MaterialImportParam(GltfMaterialImporter.GetMaterialName(i, null), GltfPbrMaterialImporter.ShaderName);
}
}
}

6
Assets/VRM10/Runtime/IO/Material/Vrm10MToonMaterialTextureImporter.cs
View File

@@ -62,7 +62,7 @@ namespace UniVRM10
{
try
{
pair = GltfPBRMaterial.BaseColorTexture(parser, src);
pair = GltfPbrMaterialImporter.BaseColorTexture(parser, src);
return true;
}
catch (NullReferenceException)
@@ -81,7 +81,7 @@ namespace UniVRM10
{
try
{
pair = GltfPBRMaterial.EmissiveTexture(parser, src);
pair = GltfPbrMaterialImporter.EmissiveTexture(parser, src);
return true;
}
catch (NullReferenceException)
@@ -101,7 +101,7 @@ namespace UniVRM10
{
try
{
pair = GltfPBRMaterial.NormalTexture(parser, src);
pair = GltfPbrMaterialImporter.NormalTexture(parser, src);
return true;
}
catch (NullReferenceException)

6
Assets/VRM10/Runtime/IO/Vrm10MaterialImporter.cs
View File

@@ -12,16 +12,16 @@ namespace UniVRM10
if (!TryCreateMToonParam(parser, i, out MaterialImportParam param))
{
// unlit
if (!GltfUnlitMaterial.TryCreateParam(parser, i, out param))
if (!GltfUnlitMaterialImporter.TryCreateParam(parser, i, out param))
{
// pbr
if (!GltfPBRMaterial.TryCreateParam(parser, i, out param))
if (!GltfPbrMaterialImporter.TryCreateParam(parser, i, out param))
{
// fallback
#if VRM_DEVELOP
Debug.LogWarning($"material: {i} out of range. fallback");
#endif
return new MaterialImportParam(GltfMaterialImporter.GetMaterialName(i, null), GltfPBRMaterial.ShaderName);
return new MaterialImportParam(GltfMaterialImporter.GetMaterialName(i, null), GltfPbrMaterialImporter.ShaderName);
}
}
}