Add scissor test when creating lightmap

src/Dodge/Base/Coordinate.hs

@@ -2,8 +2,12 @@ module Dodge.Base.Coordinate (
     worldPosToScreen,
     screenToWorldPos,
     mouseWorldPos,
+    worldPosToResOffset,
 ) where
 
+import Dodge.WindowSize
+import Linear
+import Dodge.Data.Config
 import Control.Lens
 import Dodge.Data.Camera
 import Dodge.Data.Input
@@ -18,9 +22,17 @@ import Geometry
 worldPosToScreen :: Camera -> Point2 -> Point2
 worldPosToScreen cam =
     rotateV (negate $ cam ^. camRot)
-        . ((cam ^. camZoom) *.*)
+        . ((cam ^. camZoom) *^)
         . (-.- (cam ^. camCenter))
 
+-- gets the position from the bottom left in "world res" "pixels"
+worldPosToResOffset :: Config -> Camera -> Point2 -> Point2
+worldPosToResOffset cfig cam p = (worldPosToScreen cam p & each %~ f)
+    + 0.5 *^ (uncurry V2 (getWindowSize _gr_world_res cfig::(Int,Int)) & each %~ fromIntegral)
+  where
+    f x = applyResFactorF (cfig ^. gr_world_res) x
+
+
 -- | The mouse position in world coordinates.
 mouseWorldPos :: Input -> Camera -> Point2
 mouseWorldPos inp cam = screenToWorldPos cam (inp ^. mousePos)

src/Dodge/Data/Config.hs

@@ -129,6 +129,15 @@ applyResFactor  rf = case rf of
     EighthRes -> (`div` 8)
     SixteenthRes -> (`div` 16)
 
+applyResFactorF :: ResFactor -> Float -> Float
+applyResFactorF  rf = case rf of
+    DoubleRes -> (2*)
+    FullRes -> id
+    HalfRes -> (/ 2)
+    QuarterRes -> (/ 4)
+    EighthRes -> (/ 8)
+    SixteenthRes -> (/ 16)
+
 --resFactorNum :: ResFactor -> Int
 --resFactorNum rf = case rf of
 --    FullRes -> 1

src/Dodge/Render.hs

@@ -161,6 +161,7 @@ doDrawing' win pdata u = do
     glEnable GL_BLEND
     --draw lightmap into its own buffer
     createLightMap
+        (w ^. wCam)
         cfig
         (fromIntegral trueNWalls)
         nSilIndices
@@ -284,6 +285,7 @@ doDrawing' win pdata u = do
         glEnable GL_BLEND
         glBindFramebuffer GL_FRAMEBUFFER (_unFBO (fst (_fboLighting pdata)))
         createLightMap
+            (w ^. wCam)
             cfig
             (fromIntegral trueNWalls)
             nSilIndices