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

mv function of importing material name

Browse Source
This commit is contained in:
Masataka SUMI
2022-11-10 21:30:13 +09:00
parent 9f16a268a6
commit bd63c7e14f
10 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/BuiltInGltfMaterialDescriptorGenerator.cs
View File

@@ -22,7 +22,7 @@ namespace UniGLTF
}
return new MaterialDescriptor(
GetMaterialName(i, null),
GltfMaterialImportUtils.ImportMaterialName(i, null),
BuiltInGltfPbrMaterialImporter.ShaderName,
null,
new Dictionary<string, TextureDescriptor>(),
@@ -30,16 +30,6 @@ namespace UniGLTF
new Dictionary<string, Color>(),
new Dictionary<string, Vector4>(),
new Action<Material>[]{});
}
public static string GetMaterialName(int index, glTFMaterial src)
{
if (src != null && !string.IsNullOrEmpty(src.name))
{
return src.name;
}
return $"material_{index:00}";
}
}
}

2
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfPbrMaterialImporter.cs
View File

@@ -206,7 +206,7 @@ namespace UniGLTF
});
matDesc = new MaterialDescriptor(
BuiltInGltfMaterialDescriptorGenerator.GetMaterialName(i, src),
GltfMaterialImportUtils.ImportMaterialName(i, src),
ShaderName,
null,
textureSlots,

2
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfUnlitMaterialImporter.cs
View File

@@ -50,7 +50,7 @@ namespace UniGLTF
}
matDesc = new MaterialDescriptor(
BuiltInGltfMaterialDescriptorGenerator.GetMaterialName(i, src),
GltfMaterialImportUtils.ImportMaterialName(i, src),
UniUnlitUtil.ShaderName,
null,
textureSlots,

9
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfMaterialImportUtils.cs
View File

@@ -5,6 +5,15 @@ namespace UniGLTF
{
public static class GltfMaterialImportUtils
{
public static string ImportMaterialName(int index, glTFMaterial src)
{
if (src != null && !string.IsNullOrEmpty(src.name))
{
return src.name;
}
return $"material_{index:00}";
}
public static Color? ImportLinearEmissiveFactorFromMaterial(GltfData data, glTFMaterial src)
{
if (src.emissiveFactor == null || src.emissiveFactor.Length != 3) return null;

2
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfPbrMaterialImporter.cs
View File

@@ -181,7 +181,7 @@ namespace UniGLTF
});
matDesc = new MaterialDescriptor(
BuiltInGltfMaterialDescriptorGenerator.GetMaterialName(i, src),
GltfMaterialImportUtils.ImportMaterialName(i, src),
ShaderName,
null,
textureSlots,

13
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/UrpGltfMaterialDescriptorGenerator.cs
View File

@@ -23,7 +23,7 @@ namespace UniGLTF
}
return new MaterialDescriptor(
GetMaterialName(i, null),
GltfMaterialImportUtils.ImportMaterialName(i, null),
BuiltInGltfPbrMaterialImporter.ShaderName,
null,
new Dictionary<string, TextureDescriptor>(),
@@ -31,17 +31,6 @@ namespace UniGLTF
new Dictionary<string, Color>(),
new Dictionary<string, Vector4>(),
new Collection<Action<Material>>());
}
public static string GetMaterialName(int index, glTFMaterial src)
{
if (src != null && !string.IsNullOrEmpty(src.name))
{
return src.name;
}
return $"material_{index:00}";
}
}
}

2
Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/VRMMaterialDescriptorGenerator.cs
View File

@@ -43,7 +43,7 @@ namespace VRM
// fallback
Debug.LogWarning($"fallback");
return new MaterialDescriptor(
BuiltInGltfMaterialDescriptorGenerator.GetMaterialName(i, null),
GltfMaterialImportUtils.ImportMaterialName(i, null),
BuiltInGltfPbrMaterialImporter.ShaderName,
null,
new Dictionary<string, TextureDescriptor>(),

2
Assets/VRM/Runtime/IO/MaterialIO/URP/Import/VRMURPMaterialDescriptorGenerator.cs
View File

@@ -27,7 +27,7 @@ namespace VRM
Debug.LogWarning($"material: {i} out of range. fallback");
}
return new MaterialDescriptor(
BuiltInGltfMaterialDescriptorGenerator.GetMaterialName(i, null),
GltfMaterialImportUtils.ImportMaterialName(i, null),
BuiltInGltfPbrMaterialImporter.ShaderName,
null,
new Dictionary<string, TextureDescriptor>(),

2
Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Vrm10MaterialDescriptorGenerator.cs
View File

@@ -22,7 +22,7 @@ namespace UniVRM10
Debug.LogWarning($"material: {i} out of range. fallback");
}
return new MaterialDescriptor(
BuiltInGltfMaterialDescriptorGenerator.GetMaterialName(i, null), BuiltInGltfPbrMaterialImporter.ShaderName,
GltfMaterialImportUtils.ImportMaterialName(i, null), BuiltInGltfPbrMaterialImporter.ShaderName,
null,
new Dictionary<string, TextureDescriptor>(),
new Dictionary<string, float>(),

2
Assets/VRM10/Runtime/IO/Material/URP/Import/Vrm10UrpMaterialDescriptorGenerator.cs
View File

@@ -17,7 +17,7 @@ namespace UniVRM10
// fallback
Debug.LogWarning($"material: {i} out of range. fallback");
return new MaterialDescriptor(
BuiltInGltfMaterialDescriptorGenerator.GetMaterialName(i, null),
GltfMaterialImportUtils.ImportMaterialName(i, null),
BuiltInGltfPbrMaterialImporter.ShaderName,
null,
new Dictionary<string, TextureDescriptor>(),