Cleanup

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));
+    float a = vCol.w*(1-d);
-    fPos = vec4(vPos, fCol.w);
+    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);
 }

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] $

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)