Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-08-26 21:04:14 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1945 from Santarh/shaderInsteadOfString2

Browse Source 
Specify a Shader instead of a string in MaterialDescriptor.
This commit is contained in:
ousttrue
2022-12-05 18:02:21 +09:00
committed by GitHub
parent dd9813cb73 0a7ac08dac
commit fcb4f1841f
19 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ namespace UniGLTF
return new MaterialDescriptor(
GltfMaterialImportUtils.ImportMaterialName(i, null),
BuiltInGltfPbrMaterialImporter.ShaderName,
BuiltInGltfPbrMaterialImporter.Shader,
null,
new Dictionary<string, TextureDescriptor>(),
new Dictionary<string, float>(),

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

@@ -15,7 +15,7 @@ namespace UniGLTF
// FIXME
return new MaterialDescriptor(
"__default__",
"Standard",
BuiltInGltfPbrMaterialImporter.Shader,
default,
new Dictionary<string, TextureDescriptor>(),
new Dictionary<string, float>(),

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

@@ -45,7 +45,7 @@ namespace UniGLTF
private static readonly int DstBlend = Shader.PropertyToID("_DstBlend");
private static readonly int ZWrite = Shader.PropertyToID("_ZWrite");
private static readonly int Cutoff = Shader.PropertyToID("_Cutoff");
public const string ShaderName = "Standard";
public static Shader Shader => Shader.Find("Standard");
private enum BlendMode
{
@@ -205,7 +205,7 @@ namespace UniGLTF
matDesc = new MaterialDescriptor(
GltfMaterialImportUtils.ImportMaterialName(i, src),
ShaderName,
Shader,
null,
textureSlots,
floatValues,

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

@@ -11,6 +11,8 @@ namespace UniGLTF
{
private static readonly int Cutoff = Shader.PropertyToID("_Cutoff");
public static Shader Shader => Shader.Find(UniUnlitUtil.ShaderName);
public static bool TryCreateParam(GltfData data, int i, out MaterialDescriptor matDesc)
{
if (i < 0 || i >= data.GLTF.materials.Count)
@@ -48,7 +50,7 @@ namespace UniGLTF
matDesc = new MaterialDescriptor(
GltfMaterialImportUtils.ImportMaterialName(i, src),
UniUnlitUtil.ShaderName,
Shader,
null,
textureSlots,
new Dictionary<string, float>(),

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

@@ -15,7 +15,7 @@ namespace UniGLTF
// FIXME
return new MaterialDescriptor(
"__default__",
UrpGltfPbrMaterialImporter.ShaderName,
UrpGltfPbrMaterialImporter.Shader,
default,
new Dictionary<string, TextureDescriptor>(),
new Dictionary<string, float>(),

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

@@ -13,11 +13,14 @@ namespace UniGLTF
/// </summary>
public static class UrpGltfPbrMaterialImporter
{
public const string ShaderName = "Universal Render Pipeline/Lit";
private static readonly int SrcBlend = Shader.PropertyToID("_SrcBlend");
private static readonly int DstBlend = Shader.PropertyToID("_DstBlend");
private static readonly int ZWrite = Shader.PropertyToID("_ZWrite");
private static readonly int Cutoff = Shader.PropertyToID("_Cutoff");
public const string ShaderName = "Universal Render Pipeline/Lit";
public static Shader Shader => Shader.Find(ShaderName);
private enum BlendMode
{
@@ -182,7 +185,7 @@ namespace UniGLTF
matDesc = new MaterialDescriptor(
GltfMaterialImportUtils.ImportMaterialName(i, src),
ShaderName,
Shader,
null,
textureSlots,
floatValues,

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

@@ -24,7 +24,7 @@ namespace UniGLTF
return new MaterialDescriptor(
GltfMaterialImportUtils.ImportMaterialName(i, null),
BuiltInGltfPbrMaterialImporter.ShaderName,
UrpGltfPbrMaterialImporter.Shader,
null,
new Dictionary<string, TextureDescriptor>(),
new Dictionary<string, float>(),

2
Assets/UniGLTF/Tests/UniGLTF/GltfLoadTests.cs
View File

@@ -227,7 +227,7 @@ namespace UniGLTF
using (var data = new AutoGltfFileParser(path).Parse())
{
var matDesc = new BuiltInGltfMaterialDescriptorGenerator().Get(data, 0);
Assert.AreEqual("Standard", matDesc.ShaderName);
Assert.AreEqual("Standard", matDesc.Shader.name);
Assert.AreEqual(5, matDesc.TextureSlots.Count);
var (key, value) = matDesc.EnumerateSubAssetKeyValue().First();
Assert.AreEqual(new SubAssetKey(typeof(Texture2D), "texture_0"), key);

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

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

5
Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInVrmMToonMaterialImporter.cs
View File

@@ -12,7 +12,7 @@ namespace VRM
/// <summary>
/// 過去バージョンに含まれていたが、廃止・統合された Shader のフォールバック情報
/// </summary>
public static Dictionary<string, string> FallbackShaders = new Dictionary<string, string>
public static readonly Dictionary<string, string> FallbackShaders = new Dictionary<string, string>
{
{"VRM/UnlitTexture", "Unlit/Texture"},
{"VRM/UnlitTransparent", "Unlit/Transparent"},
@@ -67,6 +67,7 @@ namespace VRM
{
shaderName = FallbackShaders[shaderName];
}
var shader = Shader.Find(shaderName);
var textureSlots = new Dictionary<string, TextureDescriptor>();
var floatValues = new Dictionary<string, float>();
@@ -75,7 +76,7 @@ namespace VRM
var actions = new List<Action<Material>>();
matDesc = new MaterialDescriptor(
name,
shaderName,
shader,
vrmMaterial.renderQueue,
textureSlots,
floatValues,

5
Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInVrmUnlitTransparentZWriteMaterialImporter.cs
View File

@@ -158,7 +158,10 @@ namespace VRM
unityMaterial.renderQueue = vrmMaterial.renderQueue;
});
matDesc = new MaterialDescriptor(name, Utils.ShaderName, null,
matDesc = new MaterialDescriptor(
name,
Shader.Find(Utils.ShaderName),
null,
textureSlots,
floatValues,
colors,

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

@@ -29,7 +29,7 @@ namespace VRM
}
return new MaterialDescriptor(
GltfMaterialImportUtils.ImportMaterialName(i, null),
BuiltInGltfPbrMaterialImporter.ShaderName,
UrpGltfPbrMaterialImporter.Shader,
null,
new Dictionary<string, TextureDescriptor>(),
new Dictionary<string, float>(),

2
Assets/VRM/Tests/MToonTest.cs
View File

@@ -72,7 +72,7 @@ namespace VRM
{
var vrmImporter = new VRMImporterContext(new VRMData(data), null);
var materialParam = new BuiltInVrmMaterialDescriptorGenerator(vrmImporter.VRM).Get(data, 0);
Assert.AreEqual("VRM/MToon", materialParam.ShaderName);
Assert.AreEqual("VRM/MToon", materialParam.Shader.name);
Assert.AreEqual("Alicia_body", materialParam.TextureSlots["_MainTex"].UnityObjectName);
var (key, value) = materialParam.EnumerateSubAssetKeyValue().First();

4
Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/BuiltInVrm10MaterialDescriptorGenerator.cs
View File

@@ -16,13 +16,15 @@ namespace UniVRM10
if (BuiltInGltfUnlitMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc;
// pbr
if (BuiltInGltfPbrMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc;
// fallback
if (Symbols.VRM_DEVELOP)
{
Debug.LogWarning($"material: {i} out of range. fallback");
}
return new MaterialDescriptor(
GltfMaterialImportUtils.ImportMaterialName(i, null), BuiltInGltfPbrMaterialImporter.ShaderName,
GltfMaterialImportUtils.ImportMaterialName(i, null),
BuiltInGltfPbrMaterialImporter.Shader,
null,
new Dictionary<string, TextureDescriptor>(),
new Dictionary<string, float>(),

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

@@ -33,7 +33,7 @@ namespace UniVRM10
// use material.name, because material name may renamed in GltfParser.
matDesc = new MaterialDescriptor(
m.name,
MToon10Meta.UnityShaderName,
Shader.Find(MToon10Meta.UnityShaderName),
null,
Vrm10MToonTextureImporter.EnumerateAllTextures(data, m, mtoon).ToDictionary(tuple => tuple.key, tuple => tuple.Item2.Item2),
TryGetAllFloats(m, mtoon).ToDictionary(tuple => tuple.key, tuple => tuple.value),

3
Assets/VRM10/Runtime/IO/Material/URP/Import/UrpVrm10MaterialDescriptorGenerator.cs
View File

@@ -14,11 +14,12 @@ namespace UniVRM10
if (BuiltInGltfUnlitMaterialImporter.TryCreateParam(data, i, out MaterialDescriptor matDesc)) return matDesc;
// pbr
if (UrpGltfPbrMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc;
// fallback
Debug.LogWarning($"material: {i} out of range. fallback");
return new MaterialDescriptor(
GltfMaterialImportUtils.ImportMaterialName(i, null),
BuiltInGltfPbrMaterialImporter.ShaderName,
UrpGltfPbrMaterialImporter.Shader,
null,
new Dictionary<string, TextureDescriptor>(),
new Dictionary<string, float>(),

2
Assets/VRM10/Tests/MaterialImportTests.cs
View File

@@ -27,7 +27,7 @@ namespace UniVRM10
var matDesc = new BuiltInVrm10MaterialDescriptorGenerator().Get(data, 0);
Assert.AreEqual("Alicia_body", matDesc.Name);
Assert.AreEqual("VRM10/MToon10", matDesc.ShaderName);
Assert.AreEqual("VRM10/MToon10", matDesc.Shader.name);
Assert.AreEqual("Alicia_body", matDesc.TextureSlots["_MainTex"].UnityObjectName);
Assert.AreEqual("Alicia_body", matDesc.TextureSlots["_ShadeTex"].UnityObjectName);

6
Assets/VRMShaders/GLTF/IO/Runtime/Material/Importer/MaterialDescriptor.cs
View File

@@ -7,7 +7,7 @@ namespace VRMShaders
public sealed class MaterialDescriptor
{
public readonly string Name;
public readonly string ShaderName;
public readonly Shader Shader;
public readonly int? RenderQueue;
public readonly IReadOnlyDictionary<string, TextureDescriptor> TextureSlots;
public readonly IReadOnlyDictionary<string, float> FloatValues;
@@ -19,7 +19,7 @@ namespace VRMShaders
public MaterialDescriptor(
string name,
string shaderName,
Shader shader,
int? renderQueue,
IReadOnlyDictionary<string, TextureDescriptor> textureSlots,
IReadOnlyDictionary<string, float> floatValues,
@@ -28,7 +28,7 @@ namespace VRMShaders
IReadOnlyList<Action<Material>> actions)
{
Name = name;
ShaderName = shaderName;
Shader = shader;
RenderQueue = renderQueue;
TextureSlots = textureSlots;
FloatValues = floatValues;

13
Assets/VRMShaders/GLTF/IO/Runtime/Material/Importer/MaterialFactory.cs
View File

@@ -101,19 +101,12 @@ namespace VRMShaders
getTexture = (x, y) => Task.FromResult<Texture>(null);
}
var shaderName = matDesc.ShaderName;
if (String.IsNullOrEmpty(shaderName))
if (matDesc.Shader == null)
{
throw new Exception("no shader name");
throw new ArgumentNullException(nameof(matDesc.Shader));
}
var shader = Shader.Find(shaderName);
if (shader == null)
{
throw new Exception($"shader: {shaderName} not found");
}
material = new Material(shader);
material = new Material(matDesc.Shader);
material.name = matDesc.SubAssetKey.Name;
foreach (var kv in matDesc.TextureSlots)