From 9e9f34fd40726a591300b3edf21f018614e5369f Mon Sep 17 00:00:00 2001 From: Xonk Date: Mon, 17 Jul 2023 15:47:09 -0400 Subject: [PATCH] make lit particles brighter --- shaders/gbuffers_all_particles.fsh | 7 ++++++- shaders/gbuffers_skytextured.fsh | 7 ------- shaders/gbuffers_skytextured.vsh | 2 +- shaders/lib/settings.glsl | 2 -- 4 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 shaders/gbuffers_skytextured.fsh diff --git a/shaders/gbuffers_all_particles.fsh b/shaders/gbuffers_all_particles.fsh index 00e2fe0..c07f6a0 100644 --- a/shaders/gbuffers_all_particles.fsh +++ b/shaders/gbuffers_all_particles.fsh @@ -160,8 +160,13 @@ void main() { float lightleakfix = clamp(eyeBrightnessSmooth.y/240.0,0.0,1.0); float phase = phaseg(clamp(dot(np3, WsunVec),0.0,1.0),(1.0-gl_FragData[0].a) * 0.8 + 0.1) + 1.0 ; vec3 Direct_lighting = DoDirectLighting(DirectLightColor, Shadows, 1.0, 0.0) * phase * lightleakfix; + vec3 Torch_Color = vec3(TORCH_R,TORCH_G,TORCH_B); - vec3 Indirect_lighting = DoAmbientLighting(AmbientLightColor, vec3(TORCH_R,TORCH_G,TORCH_B), clamp(lmtexcoord.zw,0.0,1.0), 5.0); + #ifdef LIT + Torch_Color *= 2.0; + #endif + + vec3 Indirect_lighting = DoAmbientLighting(AmbientLightColor, Torch_Color, clamp(lmtexcoord.zw,0.0,1.0), 5.0); // gl_FragData[0].a = TEXTURE.a; diff --git a/shaders/gbuffers_skytextured.fsh b/shaders/gbuffers_skytextured.fsh deleted file mode 100644 index 21db346..0000000 --- a/shaders/gbuffers_skytextured.fsh +++ /dev/null @@ -1,7 +0,0 @@ -#version 120 - -/* RENDERTARGETS:0 */ - -void main() { - discard; -} diff --git a/shaders/gbuffers_skytextured.vsh b/shaders/gbuffers_skytextured.vsh index 0a2f94b..d83bef7 100644 --- a/shaders/gbuffers_skytextured.vsh +++ b/shaders/gbuffers_skytextured.vsh @@ -1,5 +1,5 @@ #version 120 void main() { - gl_Position = ftransform(); + gl_Position.xyz = vec3(-1.0); } diff --git a/shaders/lib/settings.glsl b/shaders/lib/settings.glsl index daba24a..ce09c8e 100644 --- a/shaders/lib/settings.glsl +++ b/shaders/lib/settings.glsl @@ -434,6 +434,4 @@ uniform int moonPhase; #define CompSky_G 0.0 // [0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 ] #define CompSky_B 0.0 // [0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 ] -// #define LIGHTNING_FLASH - // #define OLD_LIGHTLEAK_FIX \ No newline at end of file