Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-05-23 19:36:18 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1011 from ousttrue/fix/VrmLoadTest.VrmTestModelsTests

Browse Source 
古いシェーダー名をフォールバック
This commit is contained in:
ousttrue 2021-06-07 20:53:22 +09:00 committed by GitHub
commit 920fffb3bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Assets/VRMShaders/GLTF/IO/Runtime/MaterialFactory.cs
View File

@ -18,6 +18,16 @@ namespace VRMShaders
m_externalMap = externalMaterialMap;
}
static Dictionary<string, string> s_fallbackShaders = new Dictionary<string, string>
{
{"VRM/UnlitTexture", "Unlit/Texture"},
{"VRM/UnlitTransparent", "Unlit/Transparent"},
{"VRM/UnlitCutout", "Unlit/Transparent Cutout"},
// 互換性は無いがとりあえず、
{"VRM/UnlitTransparentZWrite", "VRM/MToon"},
{"UniGLTF/StandardVColor", UniGLTF.UniUnlit.Utils.ShaderName},
};
public struct MaterialLoadInfo
{
public readonly Material Asset;
@ -109,29 +119,47 @@ namespace VRMShaders
getTexture = (_) => Task.FromResult<Texture>(null);
}
material = new Material(Shader.Find(matDesc.ShaderName));
var shaderName = matDesc.ShaderName;
if (String.IsNullOrEmpty(shaderName))
{
throw new Exception("no shader name");
}
if (s_fallbackShaders.TryGetValue(shaderName, out string fallback))
{
Debug.LogWarning($"fallback: {shaderName} => {fallback}");
shaderName = fallback;
}
var shader = Shader.Find(shaderName);
if (shader == null)
{
throw new Exception($"shader: {shaderName} not found");
}
material = new Material(shader);
material.name = matDesc.SubAssetKey.Name;
foreach(var kv in matDesc.TextureSlots)
foreach (var kv in matDesc.TextureSlots)
{
var texture = await getTexture(kv.Value);
if(texture!=null){
if (texture != null)
{
material.SetTexture(kv.Key, texture);
SetTextureOffsetAndScale(material, kv.Key, kv.Value.Offset, kv.Value.Scale);
}
}
foreach(var kv in matDesc.Colors)
foreach (var kv in matDesc.Colors)
{
material.SetColor(kv.Key, kv.Value);
}
foreach(var kv in matDesc.Vectors)
foreach (var kv in matDesc.Vectors)
{
material.SetVector(kv.Key, kv.Value);
}
foreach(var kv in matDesc.FloatValues)
foreach (var kv in matDesc.FloatValues)
{
material.SetFloat(kv.Key, kv.Value);
}
@ -141,7 +169,7 @@ namespace VRMShaders
material.renderQueue = matDesc.RenderQueue.Value;
}
foreach(var action in matDesc.Actions)
foreach (var action in matDesc.Actions)
{
action(material);
}

9
Assets/VRMShaders/GLTF/IO/Runtime/VRMShaders.GLTF.IO.Runtime.asmdef
View File

@ -1,13 +1,14 @@
{
"name": "VRMShaders.GLTF.IO.Runtime",
"references": [],
"references": [
"VRMShaders.GLTF.UniUnlit.Runtime"
],
"optionalUnityReferences": [],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": false,
"defineConstraints": [],
"versionDefines": [],
"noEngineReferences": false
"defineConstraints": []
}