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

Merge branch 'master' into feature/vrm0fastbone_use_springbonejobs

Browse Source
This commit is contained in:
ousttrue 2024-09-05 18:29:40 +09:00 committed by GitHub
commit 6e201b76a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon_forward_fragment.hlsl
View File

@ -48,12 +48,23 @@ half4 MToonFragment(const FragmentInput fragmentInput) : SV_Target
#if defined(MTOON_URP) && defined(_ADDITIONAL_LIGHTS) && !defined(MTOON_PASS_OUTLINE)
uint pixelLightCount = GetAdditionalLightsCount();
#if defined(USE_FORWARD_PLUS)
InputData inputData = (InputData)0;
inputData.normalizedScreenSpaceUV = GetNormalizedScreenSpaceUV(input.pos);
inputData.positionWS = input.positionWS;
LIGHT_LOOP_BEGIN(pixelLightCount)
UnityLighting additionalUnityLighting = GetAdditionalUnityLighting(input, normalWS, lightIndex);
col.rgb += GetMToonURPAdditionalLighting(additionalUnityLighting, mtoonInput).rgb;
LIGHT_LOOP_END
#else
for (uint lightIndex = 0u; lightIndex < pixelLightCount; ++lightIndex)
{
UnityLighting additionalUnityLighting = GetAdditionalUnityLighting(input, normalWS, lightIndex);
col.rgb += GetMToonURPAdditionalLighting(additionalUnityLighting, mtoonInput).rgb;
}
#endif
#endif
// Apply Fog
#ifdef MTOON_URP

1
Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon_urp.shader
View File

@ -112,6 +112,7 @@ Shader "VRM10/Universal Render Pipeline/MToon10"
#pragma multi_compile _ _MAIN_LIGHT_SHADOWS
#pragma multi_compile _ _MAIN_LIGHT_SHADOWS_CASCADE
#pragma multi_compile _ _ADDITIONAL_LIGHTS_VERTEX _ADDITIONAL_LIGHTS
#pragma multi_compile _ _FORWARD_PLUS
#pragma multi_compile_fragment _ _ADDITIONAL_LIGHT_SHADOWS
#pragma multi_compile_fragment _ _SHADOWS_SOFT
#pragma multi_compile _ LIGHTMAP_SHADOW_MIXING