From d1ea1d331021a61b863c41a52058d68f9bb65976 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Thu, 5 May 2022 22:59:42 +0200 Subject: [PATCH] Shinemap math requires unmodified eye normals. --- language.version | 4 ++-- shaders/glsl/Shinemap.fp | 2 +- shaders/glsl/Shinemask.fp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/language.version b/language.version index 446755d6d..5700aca6e 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r55 \cu(Wed 4 May 11:54:46 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r55 \cu(2022-05-04 11:54:46)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r56 \cu(Thu 5 May 22:59:42 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r56 \cu(2022-05-05 22:59:42)\c-"; diff --git a/shaders/glsl/Shinemap.fp b/shaders/glsl/Shinemap.fp index ea744a0ef..7d5d573d9 100644 --- a/shaders/glsl/Shinemap.fp +++ b/shaders/glsl/Shinemap.fp @@ -2,7 +2,7 @@ void SetupMaterial( inout Material mat ) { - vec3 rnorm = normalize(vEyeNormal.xyz)*vec3(1,-1,1); + vec3 rnorm = normalize(vEyeNormalOrig.xyz)*vec3(1,-1,1); #ifdef BARRIER_MAP vec4 basemap = getTexel(rnorm.xy*.49+.5); basemap.rgb *= .25; diff --git a/shaders/glsl/Shinemask.fp b/shaders/glsl/Shinemask.fp index eed4df75f..14983f162 100644 --- a/shaders/glsl/Shinemask.fp +++ b/shaders/glsl/Shinemask.fp @@ -4,7 +4,7 @@ void SetupMaterial( inout Material mat ) { vec4 base = getTexel(vTexCoord.st); float mask = texture(masktex,vTexCoord.st).x; - vec3 rnorm = normalize(vEyeNormal.xyz)*vec3(1,-1,1); + vec3 rnorm = normalize(vEyeNormalOrig.xyz)*vec3(1,-1,1); mat.Base = vec4(base.rgb+texture(envtex,rnorm.xy*.49+.5).rgb*mask,base.a); mat.Normal = ApplyNormalMap(vTexCoord.st); if ( (uTextureMode&TEXF_Brightmap) != 0 )