Skip to content

Commit 2f85b55

Browse files
authored
Task/2033 urp shadow issue (#302)
* on the way to the investigation. * Fixed: the issue. * Updated the changelog. * Removed unnecessary header include in UnityToon.shader for URP.
1 parent ad46501 commit 2f85b55

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

com.unity.toonshader/CHANGELOG.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Changelog
2-
## [0.9.2-preview] - 2023-04-07
3-
### Updated
4-
* Next version is 0.9.2-preview
2+
## [0.9.2-preview] - 2023-04-12
3+
### Fixed
4+
* URP shader doesn't recieve shadows in player builds.
55

66
## [0.9.1-preview] - 2023-03-30
77
### Fixed

com.unity.toonshader/Runtime/Integrated/Shaders/UnityToon.shader

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,8 +1212,7 @@ Shader "Toon" {
12121212
#endif
12131213
// -------------------------------------
12141214
// Lightweight Pipeline keywords
1215-
#pragma multi_compile _ _MAIN_LIGHT_SHADOWS
1216-
#pragma multi_compile _ _MAIN_LIGHT_SHADOWS_CASCADE
1215+
#pragma multi_compile _ _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _MAIN_LIGHT_SHADOWS_SCREEN
12171216
#pragma multi_compile _ _ADDITIONAL_LIGHTS_VERTEX _ADDITIONAL_LIGHTS
12181217
#pragma multi_compile _ _ADDITIONAL_LIGHT_SHADOWS
12191218
#pragma multi_compile _ _SHADOWS_SOFT
@@ -1222,8 +1221,11 @@ Shader "Toon" {
12221221
#pragma multi_compile _ _MIXED_LIGHTING_SUBTRACTIVE
12231222
// -------------------------------------
12241223
// Unity defined keywords
1224+
#pragma multi_compile _ LIGHTMAP_SHADOW_MIXING
1225+
#pragma multi_compile _ SHADOWS_SHADOWMASK
12251226
#pragma multi_compile _ DIRLIGHTMAP_COMBINED
12261227
#pragma multi_compile _ LIGHTMAP_ON
1228+
#pragma multi_compile _ DYNAMICLIGHTMAP_ON
12271229
#pragma multi_compile_fog
12281230

12291231
#define _IS_PASS_FWDBASE

com.unity.toonshader/Runtime/Integrated/Shaders/UnityToonTessellation.shader

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1273,20 +1273,23 @@ Shader "Toon(Tessellation)" {
12731273
#endif
12741274
// -------------------------------------
12751275
// Lightweight Pipeline keywords
1276-
#pragma multi_compile _ _MAIN_LIGHT_SHADOWS
1277-
#pragma multi_compile _ _MAIN_LIGHT_SHADOWS_CASCADE
1276+
#pragma multi_compile _ _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _MAIN_LIGHT_SHADOWS_SCREEN
12781277
#pragma multi_compile _ _ADDITIONAL_LIGHTS_VERTEX _ADDITIONAL_LIGHTS
12791278
#pragma multi_compile _ _ADDITIONAL_LIGHT_SHADOWS
12801279
#pragma multi_compile _ _SHADOWS_SOFT
1281-
1280+
#pragma multi_compile _ _FORWARD_PLUS
1281+
12821282
#pragma multi_compile _ _MIXED_LIGHTING_SUBTRACTIVE
12831283
// -------------------------------------
12841284
// Unity defined keywords
1285+
#pragma multi_compile _ LIGHTMAP_SHADOW_MIXING
1286+
#pragma multi_compile _ SHADOWS_SHADOWMASK
12851287
#pragma multi_compile _ DIRLIGHTMAP_COMBINED
12861288
#pragma multi_compile _ LIGHTMAP_ON
1287-
// #pragma multi_compile_fog
1289+
#pragma multi_compile _ DYNAMICLIGHTMAP_ON
1290+
#pragma multi_compile_fog
12881291

1289-
#pragma multi_compile _IS_PASS_FWDBASE
1292+
#define _IS_PASS_FWDBASE
12901293
// DoubleShadeWithFeather and ShadingGradeMap use different fragment shader.
12911294
#pragma shader_feature_local _ _SHADINGGRADEMAP
12921295

0 commit comments

Comments
 (0)