Compile demos with main project.

4 files changed, 11 insertions, 8 deletions

diff --git a/demos/pong/Main.hs b/Demos/Pong/Main.hs
index a9dfcdd..4dbe0a3 100644
--- a/demos/pong/Main.hs
+++ b/Demos/Pong/Main.hs
@@ -1,8 +1,10 @@
+{-# LANGUAGE ImportQualifiedPost #-}
+
 module Main where
 
 import Data.Maybe (mapMaybe)
 import Graphics.Rendering.OpenGL.GL (($=))
-import qualified Graphics.Rendering.OpenGL.GL as GL
+import Graphics.Rendering.OpenGL.GL qualified as GL
 import Pong
 import Spear.App
 import Spear.Game
diff --git a/demos/pong/Pong.hs b/Demos/Pong/Pong.hs
index accc75d..b048bbc 100644
--- a/demos/pong/Pong.hs
+++ b/Demos/Pong/Pong.hs
@@ -60,8 +60,8 @@ update elapsed dt evts gos go =
    in go' {gostep = s'}
 
 ballBox, padBox :: AABB2
-ballBox = AABB2 (vec2 (- s) (- s)) (vec2 s s) where s = ballSize
-padBox = AABB2 (- padSize) padSize
+ballBox = AABB2 (vec2 (-s) (-s)) (vec2 s s) where s = ballSize
+padBox = AABB2 (-padSize) padSize
 
 obj2 = obj2FromVectors unitx2 unity2
 
@@ -80,8 +80,8 @@ collideBall vel = step $ \_ dt gos _ ball ->
   let (AABB2 pmin pmax) = aabb ball `aabbAdd` pos ball
       collideCol = x pmin < 0 || x pmax > 1
       collideRow = y pmin < 0 || y pmax > 1 || any (collide ball) (tail gos)
-      negx v@(Vector2 x y) = if collideCol then vec2 (- x) y else v
-      negy v@(Vector2 x y) = if collideRow then vec2 x (- y) else v
+      negx v@(Vector2 x y) = if collideCol then vec2 (-x) y else v
+      negy v@(Vector2 x y) = if collideRow then vec2 x (-y) else v
       vel' = negx . negy $ vel
       delta = dt -- A small delta to apply when collision occurs.
       adjustX = if collideCol then scale delta (vec2 (x vel) 0) else vec2 0 0
@@ -94,7 +94,8 @@ collide go1 go2 =
       (AABB2 (Vector2 xmin2 ymin2) (Vector2 xmax2 ymax2)) =
         aabb go2 `aabbAdd` pos go2
    in not $
-        xmax1 < xmin2 || xmin1 > xmax2
+        xmax1 < xmin2
+          || xmin1 > xmax2
           || ymax1 < ymin2
           || ymin1 > ymax2
 
@@ -122,7 +123,7 @@ stepPlayer = sfold moveGO .> clamp
 
 moveGO =
   mconcat
-    [ switch StopLeft sid MoveLeft (moveGO' $ vec2 (- playerSpeed) 0),
+    [ switch StopLeft sid MoveLeft (moveGO' $ vec2 (-playerSpeed) 0),
       switch StopRight sid MoveRight (moveGO' $ vec2 playerSpeed 0)
     ]
 
diff --git a/demos/pong/Setup.hs b/Demos/Pong/Setup.hs
index e8ef27d..e8ef27d 100644
--- a/demos/pong/Setup.hs
+++ b/Demos/Pong/Setup.hs
diff --git a/Spear.cabal b/Spear.cabal
index 81ca38a..824f352 100644
--- a/Spear.cabal
+++ b/Spear.cabal
@@ -117,7 +117,7 @@ library
     ghc-prof-options: -O2 -fprof-auto -fprof-cafs

 

 executable pong

-  hs-source-dirs:      demos/pong

+  hs-source-dirs:      Demos/Pong

   main-is:             Main.hs

   other-modules:       Pong

   build-depends:       base, Spear, OpenGL