Make light position uniform 3d

src/Picture/Render.hs

@@ -55,12 +55,11 @@ createLightMap
     :: RenderData 
     -> Int                  -- Resolution division
     -> [(Point2,Point2)]    -- Wall pairs
-    -> [Point4]             -- Lights
+    -> [(Point3,Float,Float)]             -- Lights
     -> (Float,Float)        -- View from position
     -> Picture              -- foreground pictures
     -> IO ()
 createLightMap pdata resDiv wallPoints lightPoints (viewFromx,viewFromy) _ = do
-
 -- get viewport size so we can reset it later
     (vppos,vpsize) <- get viewport
 -- set the viewport size to that of the render buffer
@@ -97,7 +96,7 @@ createLightMap pdata resDiv wallPoints lightPoints (viewFromx,viewFromy) _ = do
     depthMask $= Disabled
     blendFunc $= (Zero, OneMinusSrcAlpha)
     stencilTest $= Enabled
-    forM_ lightPoints $ \(x,y,r,lum) -> do
+    forM_ lightPoints $ \((x,y,z),r,lum) -> do
 -- bind buffer for floor light circle
         let lightPtr = _vboPointer $ _vaoVBO $ _shaderVAO $ _lightingFloorShader pdata
         pokeFourOff lightPtr 0 (x,y,r,lum)
@@ -109,7 +108,7 @@ createLightMap pdata resDiv wallPoints lightPoints (viewFromx,viewFromy) _ = do
         stencilFunc $= (Always, 0, 255)
         currentProgram $= Just (_shaderProgram $ _lightingOccludeShader pdata)
         uniform (head $  _shaderCustomUnis $ _lightingOccludeShader pdata)
-            $= Vector2 x y
+            $= Vector3 x y z
         drawShader (_lightingOccludeShader pdata) nWalls
         cullFace $= Just Front
         stencilOp $= (OpKeep,OpKeep,OpDecr)
@@ -123,7 +122,7 @@ createLightMap pdata resDiv wallPoints lightPoints (viewFromx,viewFromy) _ = do
 -- draw wall light "circles"
         currentProgram $= Just (_shaderProgram $ _lightingWallShader pdata)
         uniform (head $  _shaderCustomUnis $ _lightingWallShader pdata)
-            $= Vector2 x y  
+            $= Vector3 x y z
         uniform (_shaderCustomUnis (_lightingWallShader pdata) !! 1)
             $= Vector2 r lum
         drawShader (_lightingWallShader pdata) nWallLights