Cleanup warnings

src/Picture/Preload.hs

@@ -1,20 +1,18 @@
 {-# LANGUAGE TemplateHaskell #-}
+{-# OPTIONS_GHC -Wno-unused-top-binds #-}
 module Picture.Preload
     ( RenderData (..)
     , preloadRender
     , cleanUpRenderPreload
     )
     where
-
 import Picture.Data
 import Shader
-import Geometry (Point2,Point3,Point4)
-
-import Graphics.Rendering.OpenGL hiding (Point (..),translate,scale,imageHeight,imageWidth)
+import Geometry.Data
 
+import Graphics.Rendering.OpenGL hiding (Point,translate,scale,imageHeight)
 import Control.Lens
 import Foreign
-
 import qualified Control.Foldl as F
 
 data RenderData = RenderData
@@ -34,7 +32,6 @@ data RenderData = RenderData
     , _fbo2                     :: (FramebufferObject, TextureObject, RenderbufferObject)
     , _fbo3                     :: (FramebufferObject, TextureObject, RenderbufferObject)
     }
-
 makeLenses ''RenderData
 
 preloadRender :: IO RenderData
@@ -187,7 +184,7 @@ pokeBezQStrat (RenderBezQ vs) = fmap (\((x,y,z),(r,g,b,a),(s,t,u,v)) -> [[x,y,z]
 pokeBezQStrat _ = []
 
 {-# INLINE pokeTriStrat #-}
-pokeTriStrat :: RenderType -> [[[Float]]]
+pokeTriStrat,pokeCharStrat,pokeArcStrat,pokeLineStrat,pokeEllStrat :: RenderType -> [[[Float]]]
 pokeTriStrat (RenderPoly vs) = fmap (\((x,y,z),(r,g,b,a)) -> [[x,y,z],[r,g,b,a]]) vs
 pokeTriStrat _ = []
 
@@ -203,6 +200,7 @@ pokeLineStrat _ = []
 pokeEllStrat (RenderEllipse vs) = fmap (\((x,y,z),(r,g,b,a)) -> [[x,y,z],[r,g,b,a]]) vs
 pokeEllStrat _ = []
 
+vert, geom, frag :: ShaderType
 vert = VertexShader
 geom = GeometryShader
 frag = FragmentShader
@@ -215,4 +213,3 @@ pokeWPColStrat (((x,y),(z,w)),(r,g,b,a)) = [[[x,y,z,w],[r,g,b,a]]]
 
 pokeBGStrat :: a -> [[[Float]]]
 pokeBGStrat = const []
-

src/Picture/Render.hs

@@ -9,21 +9,21 @@ module Picture.Render
     where
 
 import Shader
-import MatrixHelper
+--import MatrixHelper
 import Picture.Preload
 import Picture.Data
 import Picture.Tree
 import Geometry
 
-import Control.Lens
+--import Control.Lens
 import Control.Monad
 import qualified Control.Foldl as F
 import Foreign hiding (rotate)
-import Graphics.Rendering.OpenGL hiding (Line,translate,scale,imageHeight,imageWidth,Polygon,Color,T)
-import Data.Foldable
+import Graphics.Rendering.OpenGL hiding (Line,translate,scale,imageHeight,Polygon,Color,T)
+--import Data.Foldable
 import Data.Tuple.Extra
 import Data.Maybe (fromJust)
-import qualified Data.IntMap.Strict as IM
+--import qualified Data.IntMap.Strict as IM
 import qualified SDL
 
 setWallDepth
@@ -190,7 +190,7 @@ renderBackground
     -> (Float,Float)    -- Translation
     -> (Float,Float)    -- Window size
     -> IO ()
-renderBackground pdata rot zoom (tranx,trany) (winx,winy) = do
+renderBackground pdata rot camZoom (tranx,trany) (winx,winy) = do
 --    depthFunc $= Just Less
 -- set drawing for on top
     --blendFuncSeparate    $= ((SrcAlphaSaturate, OneMinusSrcAlpha), (Zero,One))
@@ -200,7 +200,7 @@ renderBackground pdata rot zoom (tranx,trany) (winx,winy) = do
     bindVertexArrayObject $= Just (_vao $ _shaderVAO $ _backgroundShader pdata)
     let backPtr = (\(_,x,_) -> x) $ head $ _vaoBufferTargets $ _shaderVAO $ _backgroundShader pdata
         backPtr2 = (\(_,x,_) -> x) $ _vaoBufferTargets (_shaderVAO $ _backgroundShader pdata) !! 1
-    pokeFourOff backPtr 0 (tranx,trany,rot,zoom)
+    pokeFourOff backPtr 0 (tranx,trany,rot,camZoom)
     pokeTwoOff backPtr2 0  (winx,winy)
     textureBinding Texture2D $= _textureObject <$> _shaderTexture (_backgroundShader pdata)
     drawArrays Points 0 1
@@ -212,8 +212,8 @@ setCommonUniforms
     -> (Float,Float)    -- ^ Translation
     -> (Float,Float)    -- ^ Window size
     -> IO ()
-setCommonUniforms pdata rot zoom (tranx,trany) (winx,winy) = do
-    setShaderUniforms rot zoom (tranx,trany) (winx,winy) 
+setCommonUniforms pdata rot camZoom (tranx,trany) (winx,winy) = do
+    setShaderUniforms rot camZoom (tranx,trany) (winx,winy) 
         ( extractProgAndUnis (_lightingFloorShader pdata) 
         : extractProgAndUnis (_lightingOccludeShader pdata) 
         : extractProgAndUnis (_lightingWallShader pdata)