diff --git a/language.version b/language.version index b75684d9e..1147a8d41 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r992 \cu(Mon 23 Oct 01:03:57 CEST 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r992 \cu(2023-10-23 01:03:57)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r993 \cu(Mon 23 Oct 17:30:04 CEST 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r993 \cu(2023-10-23 17:30:04)\c-"; diff --git a/zscript/handler/swwm_handler_shaders.zsc b/zscript/handler/swwm_handler_shaders.zsc index ef618cbcb..141e66c7e 100644 --- a/zscript/handler/swwm_handler_shaders.zsc +++ b/zscript/handler/swwm_handler_shaders.zsc @@ -31,6 +31,14 @@ extend Class SWWMHandler if ( !swwm_shaders ) ClearAllShaders(true); return; } + // handle weapon wheel shader here + if ( wsel ) + { + PPShader.SetEnabled("BokehSel",true); + double salph = SWWMUtility.Lerp(wsel.olalph,wsel.alph,e.fractic); + PPShader.SetUniform1f("BokehSel","strength",salph); + } + else PPShader.SetEnabled("BokehSel",false); let divi = DivineSpriteEffect(mo.FindInventory("DivineSpriteEffect")); if ( divi ) { diff --git a/zscript/hud/swwm_hudextra.zsc b/zscript/hud/swwm_hudextra.zsc index 9722a6356..1aec137ac 100644 --- a/zscript/hud/swwm_hudextra.zsc +++ b/zscript/hud/swwm_hudextra.zsc @@ -1130,11 +1130,7 @@ Class SWWMWeaponSelect : HUDMessageBase case 2: // fade out alph -= 6./GameTicRate; - if ( alph <= 0. ) - { - PPShader.SetEnabled("BokehSel",false); // clear the shader - return true; - } + if ( alph <= 0. ) return true; break; } // smooth scroll @@ -1152,11 +1148,6 @@ Class SWWMWeaponSelect : HUDMessageBase double fractic = System.GetTimeFrac(); double ssmoothY = SWWMUtility.Lerp(olsmoothY,smoothY,fractic); double salph = SWWMUtility.Lerp(olalph,alph,fractic); - if ( swwm_shaders ) - { - PPShader.SetEnabled("BokehSel",true); - PPShader.SetUniform1f("BokehSel","strength",salph); - } Screen.Dim("Black",.4*salph,0,0,Screen.GetWidth(),Screen.GetHeight()); double hs; Vector2 ss;