From 5ac55058b4b0f8c57d3382b26d0219f139569a14 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Fri, 4 Apr 2025 20:51:37 +0200 Subject: [PATCH] Remove entirely unnecessary texture and shader. --- gldefs/items/keys.txt | 4 ---- language.version | 4 ++-- models/DoomKeyLight3.png | Bin 349 -> 0 bytes shaders/glsl/KeyBlink.fp | 11 ----------- zmapinfo.txt | 1 - 5 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 models/DoomKeyLight3.png delete mode 100644 shaders/glsl/KeyBlink.fp diff --git a/gldefs/items/keys.txt b/gldefs/items/keys.txt index 75458813c..f1f4a8478 100644 --- a/gldefs/items/keys.txt +++ b/gldefs/items/keys.txt @@ -92,10 +92,6 @@ Material Texture "models/DoomKeyLight.png" { Brightmap "brightmaps/Fullbright.png" } -Material Texture "models/DoomKeyLight3.png" -{ - Shader "shaders/glsl/KeyBlink.fp" -} Material Texture "models/DoomRedSkull.png" { diff --git a/language.version b/language.version index bb9bd28c0..73f27c918 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1210 \cu(mar 01 abr 2025 17:13:44 CEST)\c-"; -SWWM_SHORTVER="\cw1.3pre r1210 \cu(2025-04-01 17:13:44)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1211 \cu(vie 04 abr 2025 20:51:37 CEST)\c-"; +SWWM_SHORTVER="\cw1.3pre r1211 \cu(2025-04-04 20:51:37)\c-"; diff --git a/models/DoomKeyLight3.png b/models/DoomKeyLight3.png deleted file mode 100644 index a0d8187b0587d8cb37d6a8fd943d86e20fc6e130..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 349 zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSU=ZM7W?*1&xYwJ_z`&3Y;1l8sQozeACMG5) zE2E~Oq_3l9VWMqkrRQRAm5$+!q84?v0wJV9~a0Tnh7PixU z>}O|kTw26^V-?T6odQpfi9I_f^ZL5#hliG5o_TzI75wc@>{4kSUj_z-9iA?ZArg|T z2M;FRF<@XZ-z5FsoCNtC1`cjdMyH%QJM(k#j&4>BU ztcm1KTk_Dsdw$>?yD{_p z=a1f*ny01jEZ=N+dgtxmo9AA7J9*#!x;4U+YkspfPHeDwafbgM0|Nttr>mdKI;Vst E0Q*vrCIA2c diff --git a/shaders/glsl/KeyBlink.fp b/shaders/glsl/KeyBlink.fp deleted file mode 100644 index ceb11d8f5..000000000 --- a/shaders/glsl/KeyBlink.fp +++ /dev/null @@ -1,11 +0,0 @@ -// emulate keycard blink cycle on hud model - -void SetupMaterial( inout Material mat ) -{ - float mixfct = floor(mod(timer*35.,20.)/10.); - vec2 uv = vTexCoord.st*vec2(.5,1.); - uv.x += mixfct*.5; - mat.Base = getTexel(uv); - mat.Normal = ApplyNormalMap(vTexCoord.st); - mat.Bright = vec4(mix(vec3(1.),vec3(0.),mixfct),1.); -} diff --git a/zmapinfo.txt b/zmapinfo.txt index 2b4971f09..4d302abcd 100644 --- a/zmapinfo.txt +++ b/zmapinfo.txt @@ -156,7 +156,6 @@ GameInfo "graphics/HUD/HealthBarS.png", // Fuzz.fp w/ GRAY_COLORS "graphics/HUD/HealthBarD.png", // HealthBarD.fp "models/SilverbulletJetSmoke.png", // JetSmoke.fp - "models/DoomKeyLight3.png", // KeyBlink.fp "sprites/MKRVA0.png", // Mykradvo.fp "models/extra/AnomRingies.png", // Mykradvo2.fp "models/MortalSight.png", // Overbright.fp