merge entity into engine; Distance to hold float

jxv · Feb 11, 2018 · 690ecb5 · 690ecb5
1 parent 290c307
commit 690ecb5
Show file tree

Hide file tree

Showing 28 changed files with 85 additions and 81 deletions.
diff --git a/library/DinoRush.hs b/library/DinoRush.hs
@@ -17,7 +17,7 @@ import DinoRush.Effect.Audio
 import DinoRush.Effect.Clock
 import DinoRush.Effect.Logger
 import DinoRush.Effect.Renderer
-import DinoRush.Entity.Obstacle
+import DinoRush.Engine.Obstacle
 import DinoRush.Wrapper.SDLInput
 import DinoRush.Wrapper.SDLRenderer
 import DinoRush.Manager.Input

diff --git a/library/DinoRush/Config.hs b/library/DinoRush/Config.hs
@@ -4,12 +4,12 @@ import qualified SDL
 import qualified SDL.Mixer as Mixer
 import qualified Animate
 
-import DinoRush.Entity.Bird
-import DinoRush.Entity.Bouncer
-import DinoRush.Entity.Dino
-import DinoRush.Entity.Mountain
-import DinoRush.Entity.Lava
-import DinoRush.Entity.Rock
+import DinoRush.Engine.Bird
+import DinoRush.Engine.Bouncer
+import DinoRush.Engine.Dino
+import DinoRush.Engine.Mountain
+import DinoRush.Engine.Lava
+import DinoRush.Engine.Rock
 import DinoRush.Engine.Types
 
 data Config = Config

diff --git a/library/DinoRush/Effect/Renderer.hs b/library/DinoRush/Effect/Renderer.hs
@@ -8,12 +8,12 @@ import Control.Monad.Reader
 
 import DinoRush.Config
 import DinoRush.Engine.Types
-import DinoRush.Entity.Dino
-import DinoRush.Entity.Lava
-import DinoRush.Entity.Rock
-import DinoRush.Entity.Bird
-import DinoRush.Entity.Bouncer
-import DinoRush.Entity.Mountain
+import DinoRush.Engine.Dino
+import DinoRush.Engine.Lava
+import DinoRush.Engine.Rock
+import DinoRush.Engine.Bird
+import DinoRush.Engine.Bouncer
+import DinoRush.Engine.Mountain
 import DinoRush.Wrapper.SDLRenderer
 
 rectFromClip :: Animate.SpriteClip key -> SDL.Rectangle CInt

diff --git a/library/DinoRush/Entity/Bird.hs → library/DinoRush/Engine/Bird.hs b/library/DinoRush/Entity/Bird.hs → library/DinoRush/Engine/Bird.hs
@@ -1,4 +1,4 @@
-module DinoRush.Entity.Bird where
+module DinoRush.Engine.Bird where
 
 import Data.Text (Text)
 import qualified Animate

diff --git a/library/DinoRush/Entity/Bouncer.hs → library/DinoRush/Engine/Bouncer.hs b/library/DinoRush/Entity/Bouncer.hs → library/DinoRush/Engine/Bouncer.hs
@@ -1,4 +1,4 @@
-module DinoRush.Entity.Bouncer where
+module DinoRush.Engine.Bouncer where
 
 import Data.Text (Text)
 import qualified Animate

diff --git a/library/DinoRush/Entity/Dino.hs → library/DinoRush/Engine/Dino.hs b/library/DinoRush/Entity/Dino.hs → library/DinoRush/Engine/Dino.hs
@@ -1,19 +1,14 @@
-module DinoRush.Entity.Dino where
+module DinoRush.Engine.Dino where
 
 import qualified Safe
-import qualified SDL
-import qualified SDL.Mixer as Mixer
 import qualified Animate
 
-import Control.Lens
 import Data.Text (Text)
-import Data.Aeson (FromJSON, ToJSON)
-import System.Random
 import KeyState
 
 import DinoRush.Engine.Frame
 import DinoRush.Engine.Types
-import DinoRush.Entity.Obstacle
+import DinoRush.Engine.Obstacle
 import DinoRush.Engine.Input
 import DinoRush.Engine.Step
 import DinoRush.Engine.Physics

diff --git a/library/DinoRush/Engine/Ground.hs b/library/DinoRush/Engine/Ground.hs
@@ -0,0 +1 @@
+module DinoRush.Engine.Ground where
diff --git a/library/DinoRush/Engine/Jungle.hs b/library/DinoRush/Engine/Jungle.hs
@@ -0,0 +1 @@
+module DinoRush.Engine.Jungle where
diff --git a/library/DinoRush/Entity/Lava.hs → library/DinoRush/Engine/Lava.hs b/library/DinoRush/Entity/Lava.hs → library/DinoRush/Engine/Lava.hs
@@ -1,4 +1,4 @@
-module DinoRush.Entity.Lava where
+module DinoRush.Engine.Lava where
 
 import qualified Animate
 import Data.Text (Text)

diff --git a/library/DinoRush/Entity/Mountain.hs → library/DinoRush/Engine/Mountain.hs b/library/DinoRush/Entity/Mountain.hs → library/DinoRush/Engine/Mountain.hs
@@ -1,4 +1,4 @@
-module DinoRush.Entity.Mountain where
+module DinoRush.Engine.Mountain where
 
 import Data.Text (Text)
 import qualified Animate

diff --git a/library/DinoRush/Entity/Obstacle.hs → library/DinoRush/Engine/Obstacle.hs b/library/DinoRush/Entity/Obstacle.hs → library/DinoRush/Engine/Obstacle.hs
@@ -1,17 +1,17 @@
-module DinoRush.Entity.Obstacle where
+module DinoRush.Engine.Obstacle where
 
 import qualified Animate
 import System.Random
 
 import DinoRush.Engine.Types
-import DinoRush.Entity.Bird
-import DinoRush.Entity.Bouncer
-import DinoRush.Entity.Ground
-import DinoRush.Entity.Jungle
-import DinoRush.Entity.Lava
-import DinoRush.Entity.Mountain
-import DinoRush.Entity.River
-import DinoRush.Entity.Rock
+import DinoRush.Engine.Bird
+import DinoRush.Engine.Bouncer
+import DinoRush.Engine.Ground
+import DinoRush.Engine.Jungle
+import DinoRush.Engine.Lava
+import DinoRush.Engine.Mountain
+import DinoRush.Engine.River
+import DinoRush.Engine.Rock
 
 data ObstacleTag
   = ObstacleTag'GroundShort
@@ -31,7 +31,7 @@ randomRBoundedEnum (aMin, aMax) g = let
   a = [minBound..lastEnum] !! (index `mod` fromEnum lastEnum)
   in (a, g')
 
-streamOfObstacles :: RandomGen g => g -> [(Distance, ObstacleTag)]
+streamOfObstacles :: RandomGen g => g -> [(Int, ObstacleTag)]
 streamOfObstacles g = zip (map (\dist -> dist `mod` 20 + 1) $ randoms g) (randoms g)
 
 data ObstacleInfo
@@ -46,5 +46,16 @@ data ObstacleState = ObstacleState
   , osDistance :: Distance
   } deriving (Show, Eq)
 
-stepObstacles :: Float -> [(Float, ObstacleTag)] -> [(Float, ObstacleTag)]
-stepObstacles delta = map (\(loc, obs) -> (loc - delta, obs))
+stepObstacles :: Distance -> [ObstacleState] -> [ObstacleState]
+stepObstacles delta = map (\o@ObstacleState{osDistance} -> ObstacleState{osDistance = osDistance - delta })
+
+removeOutOfBoundObstacles :: [ObstacleState] -> ([ObstacleState], [ObstacleState])
+removeOutOfBoundObstacles os = foldr
+  (\o@ObstacleState{osDistance} (removed, remained) ->
+    if inBounds osDistance
+      then (o : removed, remained)
+      else (removed, o : remained))
+  ([], [])
+  os
+  where
+    inBounds x = x - 32 < 0
diff --git a/library/DinoRush/Entity/Play.hs → library/DinoRush/Engine/Play.hs b/library/DinoRush/Entity/Play.hs → library/DinoRush/Engine/Play.hs
@@ -1,13 +1,13 @@
 {-# LANGUAGE TemplateHaskell #-}
-module DinoRush.Entity.Play where
+module DinoRush.Engine.Play where
 
 import qualified Animate
 import Control.Lens
 
 import DinoRush.Engine.Types
-import DinoRush.Entity.Dino
-import DinoRush.Entity.Mountain
-import DinoRush.Entity.Obstacle
+import DinoRush.Engine.Dino
+import DinoRush.Engine.Mountain
+import DinoRush.Engine.Obstacle
 
 data PlayVars = PlayVars
   { pvScore :: Score
@@ -23,12 +23,12 @@ data PlayVars = PlayVars
   , pvGroundPosition :: Percent
   , pvNeargroundPosition :: Percent
   , pvObstacles :: [ObstacleState]
-  , pvUpcomingObstacles :: [(Distance, ObstacleTag)]
+  , pvUpcomingObstacles :: [(Int, ObstacleTag)]
   } deriving (Show, Eq)
 
 makeClassy ''PlayVars
 
-initPlayVars :: [(Distance, ObstacleTag)] -> PlayVars
+initPlayVars :: [(Int, ObstacleTag)] -> PlayVars
 initPlayVars upcomingObstacles = PlayVars
   { pvScore = 0
   , pvLives = 1

diff --git a/library/DinoRush/Engine/River.hs b/library/DinoRush/Engine/River.hs
@@ -0,0 +1 @@
+module DinoRush.Engine.River where
diff --git a/library/DinoRush/Entity/Rock.hs → library/DinoRush/Engine/Rock.hs b/library/DinoRush/Entity/Rock.hs → library/DinoRush/Engine/Rock.hs
@@ -1,4 +1,4 @@
-module DinoRush.Entity.Rock where
+module DinoRush.Engine.Rock where
 
 import qualified Animate
 import Data.Text (Text)

diff --git a/library/DinoRush/Entity/Scene.hs → library/DinoRush/Engine/Scene.hs b/library/DinoRush/Entity/Scene.hs → library/DinoRush/Engine/Scene.hs
@@ -1,4 +1,4 @@
-module DinoRush.Entity.Scene where
+module DinoRush.Engine.Scene where
 
 data Scene
   = Scene'Title

diff --git a/library/DinoRush/Entity/Title.hs → library/DinoRush/Engine/Title.hs b/library/DinoRush/Entity/Title.hs → library/DinoRush/Engine/Title.hs
@@ -1,12 +1,12 @@
 {-# LANGUAGE TemplateHaskell #-}
-module DinoRush.Entity.Title where
+module DinoRush.Engine.Title where
 
 import qualified Animate
 import Control.Lens
 
 import DinoRush.Engine.Types
-import DinoRush.Entity.Dino
-import DinoRush.Entity.Mountain
+import DinoRush.Engine.Dino
+import DinoRush.Engine.Mountain
 
 data TitleVars = TitleVars
   { tvPlayer :: Animate.Position DinoKey Seconds

diff --git a/library/DinoRush/Engine/Types.hs b/library/DinoRush/Engine/Types.hs
@@ -18,8 +18,8 @@ newtype Lives = Lives Int
 newtype Percent = Percent Float
   deriving (Show, Eq, Num, Fractional, RealFrac, Real, Ord)
 
-newtype Distance = Distance Integer
-  deriving (Show, Eq, Num, Integral, Real, Ord, Enum, Random)
+newtype Distance = Distance Float
+  deriving (Show, Eq, Num, Fractional, RealFrac, Real, Ord)
 
 newtype Seconds = Seconds Float
   deriving (Show, Eq, Num, ToJSON, FromJSON, Fractional, Ord)

diff --git a/library/DinoRush/Entity/Ground.hs b/library/DinoRush/Entity/Ground.hs
diff --git a/library/DinoRush/Entity/Jungle.hs b/library/DinoRush/Entity/Jungle.hs
diff --git a/library/DinoRush/Entity/River.hs b/library/DinoRush/Entity/River.hs
diff --git a/library/DinoRush/Manager/Scene.hs b/library/DinoRush/Manager/Scene.hs
@@ -3,7 +3,7 @@ module DinoRush.Manager.Scene
   , Scene(..)
   ) where
 
-import DinoRush.Entity.Scene
+import DinoRush.Engine.Scene
 
 class Monad m => SceneManager m where
   toScene :: Scene -> m ()
diff --git a/library/DinoRush/Resource.hs b/library/DinoRush/Resource.hs
@@ -9,12 +9,12 @@ import SDL.Vect
 
 import DinoRush.Config
 import DinoRush.Engine.Types
-import DinoRush.Entity.Dino
-import DinoRush.Entity.Bird
-import DinoRush.Entity.Bouncer
-import DinoRush.Entity.Lava
-import DinoRush.Entity.Mountain
-import DinoRush.Entity.Rock
+import DinoRush.Engine.Dino
+import DinoRush.Engine.Bird
+import DinoRush.Engine.Bouncer
+import DinoRush.Engine.Lava
+import DinoRush.Engine.Mountain
+import DinoRush.Engine.Rock
 
 loadSurface :: FilePath -> Maybe Animate.Color -> IO SDL.Surface
 loadSurface path alpha = do

diff --git a/library/DinoRush/Runner.hs b/library/DinoRush/Runner.hs
@@ -13,10 +13,9 @@ import DinoRush.Effect.Clock
 import DinoRush.Effect.Logger
 import DinoRush.Effect.Renderer
 import DinoRush.Engine.Input
-import DinoRush.Engine.Types
 import DinoRush.Engine.Frame
-import DinoRush.Entity.Play
-import DinoRush.Entity.Title
+import DinoRush.Engine.Play
+import DinoRush.Engine.Title
 import DinoRush.Manager.Input
 import DinoRush.Manager.Scene
 import DinoRush.Scene.GameOver

diff --git a/library/DinoRush/Scene/GameOver.hs b/library/DinoRush/Scene/GameOver.hs
@@ -4,8 +4,8 @@ module DinoRush.Scene.GameOver where
 import qualified Animate
 import Control.Lens
 
-import DinoRush.Entity.Dino
-import DinoRush.Entity.Obstacle
+import DinoRush.Engine.Dino
+import DinoRush.Engine.Obstacle
 import DinoRush.Engine.Types
 
 data GameOverVars = GameOverVars

diff --git a/library/DinoRush/Scene/Pause.hs b/library/DinoRush/Scene/Pause.hs
@@ -7,7 +7,7 @@ import KeyState
 import DinoRush.Effect.Renderer
 import DinoRush.Engine.Input
 import DinoRush.Scene.Play
-import DinoRush.Entity.Play
+import DinoRush.Engine.Play
 import DinoRush.Manager.Input
 import DinoRush.Manager.Scene
 

diff --git a/library/DinoRush/Scene/Play.hs b/library/DinoRush/Scene/Play.hs
@@ -16,9 +16,9 @@ import DinoRush.Engine.Input
 import DinoRush.Engine.Frame
 import DinoRush.Engine.Types
 import DinoRush.Engine.Step
-import DinoRush.Entity.Dino
-import DinoRush.Entity.Obstacle
-import DinoRush.Entity.Play
+import DinoRush.Engine.Dino
+import DinoRush.Engine.Obstacle
+import DinoRush.Engine.Play
 import DinoRush.Manager.Scene
 import DinoRush.Manager.Input
 
@@ -45,7 +45,7 @@ drawPlay = do
   drawJungle (truncate $ 1280 * pvBackgroundPositionNear pv, jungleY)
   drawGround (truncate $ 1280 * pvGroundPosition pv, groundY)
   forM_ (pvObstacles pv) $ \ObstacleState{osInfo,osDistance} -> let
-    x = fromIntegral osDistance * 16
+    x = truncate $ osDistance * 16
     in case osInfo of
       ObstacleInfo'Lava pos -> drawLava (Animate.currentLocation lavaAnimations pos) (x, 0)
       ObstacleInfo'Rock pos -> drawRock (Animate.currentLocation rockAnimations pos) (x, 0)
@@ -73,8 +73,9 @@ updatePlay = do
   input <- getInput
   dinoAnimations <- getDinoAnimations
   mountainAnimations <- getMountainAnimations
-  PlayVars{pvDinoAction} <- gets (view playVars)
-  let dinoAction = stepDinoAction input pvDinoAction
+  pv' <- gets (view playVars)
+  let dinoAction = stepDinoAction input (pvDinoAction pv')
+  let (removed, remained) = removeOutOfBoundObstacles $ stepObstacles (realToFrac (pvSpeed pv')) (pvObstacles pv')
   modify $ playVars %~ (\pv -> pv
     { pvDinoPos = stepDinoPosition dinoAction dinoAnimations (pvDinoPos pv)
     , pvMountainPos = Animate.stepPosition mountainAnimations (pvMountainPos pv) frameDeltaSeconds
@@ -85,4 +86,6 @@ updatePlay = do
     , pvSpeed = clamp (pvSpeed pv + 0.01) 5
     , pvDinoAction = smash dinoAction
     , pvDinoSfx = stepDinoSfx dinoAction
+    , pvObstacles = remained
+    , pvScore = pvScore pv + fromIntegral (length removed)
     })
diff --git a/library/DinoRush/Scene/Title.hs b/library/DinoRush/Scene/Title.hs
@@ -12,11 +12,8 @@ import DinoRush.Config
 import DinoRush.Effect.Renderer
 import DinoRush.Engine.Input
 import DinoRush.Engine.Frame
-import DinoRush.Engine.Types
-import DinoRush.Entity.Dino
-import DinoRush.Entity.Mountain
-import DinoRush.Entity.Obstacle
-import DinoRush.Entity.Title
+import DinoRush.Engine.Dino
+import DinoRush.Engine.Title
 import DinoRush.Manager.Input
 import DinoRush.Manager.Scene
 

diff --git a/library/DinoRush/State.hs b/library/DinoRush/State.hs
@@ -5,10 +5,9 @@ import Control.Lens
 
 import DinoRush.Manager.Scene
 import DinoRush.Engine.Input
-import DinoRush.Engine.Types
-import DinoRush.Entity.Obstacle
-import DinoRush.Entity.Play
-import DinoRush.Entity.Title
+import DinoRush.Engine.Obstacle
+import DinoRush.Engine.Play
+import DinoRush.Engine.Title
 
 data Vars = Vars
   { vScene :: Scene
@@ -18,7 +17,7 @@ data Vars = Vars
   , vInput :: Input
   } deriving (Show, Eq)
 
-initVars :: [(Distance, ObstacleTag)] -> Vars
+initVars :: [(Int, ObstacleTag)] -> Vars
 initVars mkObstacles = Vars Scene'Title Scene'Title initTitleVars (initPlayVars mkObstacles) initInput
 
 instance HasTitleVars Vars where