From bbb682242da7b48cba033a81f05f5cde9af7fd5f Mon Sep 17 00:00:00 2001 From: justin Date: Thu, 20 Nov 2025 16:05:02 +0000 Subject: [PATCH] Cleanup --- shader/pull/cloud.frag | 9 ++++++--- src/Dodge/Render.hs | 2 +- src/Dodge/Update.hs | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/shader/pull/cloud.frag b/shader/pull/cloud.frag index 1eaf4cc52..b1cd255bb 100644 --- a/shader/pull/cloud.frag +++ b/shader/pull/cloud.frag @@ -9,9 +9,12 @@ void main() { float d = dot(vControls,vControls); if (d > 1) {discard;} + // the following is an alternative without using discard + // not sure how this would interact with bloom //float d = min(dot(vControls,vControls),1); - fCol = vec4(vCol.xyz,vCol.w*(1-d)); - fPos = vec4(vPos, fCol.w); + float a = vCol.w*(1-d); + fCol = vec4(vCol.xyz,a); + fPos = vec4(vPos, a); //fNorm = vec4(-vControls, -0.1 + 0.2 * d ,fCol.w); - fNorm = vec4(-vControls, -0.1 + 0.3 * d ,fCol.w); + fNorm = vec4(-vControls, -0.1 + 0.3 * d ,a); } diff --git a/src/Dodge/Render.hs b/src/Dodge/Render.hs index 39762b72d..32dcf73ac 100644 --- a/src/Dodge/Render.hs +++ b/src/Dodge/Render.hs @@ -296,7 +296,7 @@ doDrawing' win pdata u = do (pdata ^. fboCloud . _2 . _3) lightPoints pdata - --draw windows onto window buffer + --draw windows into window textures glBindFramebuffer GL_FRAMEBUFFER (pdata ^. fboWindow . _1 . unFBO) glBindTextureUnit 3 (pdata ^. fboPos . _2 . unTO) withArray [GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1] $ diff --git a/src/Dodge/Update.hs b/src/Dodge/Update.hs index 976cb9d5c..b422c9a97 100644 --- a/src/Dodge/Update.hs +++ b/src/Dodge/Update.hs @@ -805,7 +805,7 @@ updateCloud w c & clTimer -~ 1 ) where - newVel@(V3 _ _ nvz) = (0.95 *.*.* springVels) +.+.+ V3 0 0 (0.01 * vertVel) + newVel@(V3 _ _ nvz) = (0.95 *^ springVels) + V3 0 0 (0.01 * vertVel) newVel2 = stripZ newVel vertVel = min 5 $ clAlt c - opz springVels = foldl' (clClSpringVel c) (_clVel c) (clsNearPoint oldPos2 w)