From 50295daebafdb1fc1d912f90f472cffbf9161ff2 Mon Sep 17 00:00:00 2001 From: jgk Date: Sat, 10 Jul 2021 15:12:51 +0200 Subject: [PATCH] Remove bloom trails --- src/Dodge/Creature/Action.hs | 8 ++++++-- src/Dodge/Render.hs | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/Dodge/Creature/Action.hs b/src/Dodge/Creature/Action.hs index c6a63457e..8c8879ca9 100644 --- a/src/Dodge/Creature/Action.hs +++ b/src/Dodge/Creature/Action.hs @@ -59,12 +59,16 @@ blinkAction -> World -> World blinkAction cr w = soundOnce teleSound - . set radDistortion distortionBulge + . over radDistortion (distortionBulge ++) . set (creatures . ix cid . crPos) p3 . blinkShockwave cid p3 $ inverseShockwaveAt cpos 40 2 2 2 w where - distortionBulge = [(p3,p3 +.+ (40,0), p3 +.+ (0,40),0.5)] + distR = 120 + distortionBulge = + [(p3,p3 +.+ (distR,0), p3 +.+ (0,distR),0.1) + ,(cpos,cpos +.+ (distR,0), cpos +.+ (0,distR),1.9) + ] cid = _crID cr p1 = mouseWorldPos w cpos = _crPos cr diff --git a/src/Dodge/Render.hs b/src/Dodge/Render.hs index 062bfc5c7..9f0ed49d8 100644 --- a/src/Dodge/Render.hs +++ b/src/Dodge/Render.hs @@ -79,26 +79,26 @@ doDrawing pdata w = do _ <- renderFoldable pdata $ picToLTree (Just 3) pic _ <- renderFoldable pdata $ picToLTree (Just 4) pic _ <- renderFoldable pdata $ picToLTree (Just 5) pic + depthMask $= Enabled - --bindFramebuffer Framebuffer $= (fst3 $ _fbo2 pdata) bindFramebuffer Framebuffer $= (fst $ _fboFourth1 pdata) viewport $= (Position 0 0, Size 300 300) depthFunc $= Just Always - --blend $= Disabled textureBinding Texture2D $= Just (snd $ _fboBloom pdata) + + --colorMask $= Color4 Disabled Disabled Disabled Enabled + --blendFunc $= (One,One) + --blendEquation $= FuncReverseSubtract + --drawShader (_fullscreenAlphaHalveShader pdata) 4 + --colorMask $= Color4 Enabled Enabled Enabled Enabled + --blendEquation $= FuncAdd + --clear [ColorBuffer] --blendFunc $= (SrcAlpha,OneMinusSrcAlpha) - --blendFuncSeparate $= ((Zero,One), (Zero,SrcAlpha)) - --drawShader (_fullscreenAlphaHalveShader pdata) 4 - --blendFunc $= (SrcAlpha,OneMinusSrcAlpha) - --drawShader (_bloomBlurShader pdata) 4 - --blendFuncSeparate $= ((Zero,One),(Zero,SrcAlpha)) - blendFunc $= (One,One) - blendEquation $= FuncReverseSubtract - drawShader (_fullscreenAlphaHalveShader pdata) 4 - blendFunc $= (SrcAlpha,OneMinusSrcAlpha) - blendEquation $= FuncAdd + blendFunc $= (One,Zero) + --textureBinding Texture2D $= Just (snd $ _fboFourth1 pdata) drawShader (_bloomBlurShader pdata) 4 + blendFunc $= (One,Zero) replicateM_ 5 $ pingPongBetween (_fboFourth1 pdata) (_fboFourth2 pdata) (_bloomBlurShader pdata) --replicateM_ 5 $ pingPongBlur pdata --blend $= Enabled