cleaner update chunks

diff --git a/Ekitai.hs b/Ekitai.hs
index 6d0c867..028373a 100644 (file)
--- a/Ekitai.hs
+++ b/Ekitai.hs
@@ -7,15 +7,6 @@ import Parse
 import Sim
 import Render
 
-hGetLines :: Handle -> IO [String]
-hGetLines h = do
-    line <- hGetLine h
-    isEof <- hIsEOF h
-    if isEof then return [line]
-    else do
-        lines <- hGetLines h
-        return (line:lines)
-
 main = do
     -- handle file stuff
     argv <- getArgs

diff --git a/Parse.hs b/Parse.hs
index 367caff..9b9de57 100644 (file)
--- a/Parse.hs
+++ b/Parse.hs
@@ -1,8 +1,9 @@
-module Parse ( ekitaiOpts, optTimeStep ) where
+module Parse ( ekitaiOpts, optTimeStep, hGetLines ) where
 
 import System.Console.GetOpt
 import System.Environment
 import System.Exit
+import System.IO
 import Data.Maybe
 import Data.Either
 
@@ -38,10 +39,13 @@ ekitaiOpts argv =
         (o, _, [])   -> ioError $ userError $ "missing input file"
         (_, _, errs) -> ioError $ userError $ concat errs 
 
--- ++ usageInfo header options
---         where header = "Usage: ekitai [OPTIONS...] simfile"
+-- reads in file by lines
+hGetLines :: Handle -> IO [String]
+hGetLines h = do
+    line <- hGetLine h
+    isEof <- hIsEOF h
+    if isEof then return [line]
+    else do
+        lines <- hGetLines h
+        return (line:lines)
 
-        -- (o, _, [])   -> do
-        --     opts <- (foldl (flip id) defaultOptions o)
-        --     if optHelp then userError $ concat usageInfo "Usage: ekitai [OPTIONS...] simfile" options
-        --     else ioError $ userError $ "missing input file"

diff --git a/Sim.hs b/Sim.hs
index 64aef9b..f9e3826 100644 (file)
--- a/Sim.hs
+++ b/Sim.hs
@@ -52,55 +52,42 @@ _physStep grid acc sim@Simulation{simSpace=s,simW=w,simH=h} =
               Pump -> updatePumpChunk x y valid acc
               Drain -> updateDrainChunk x y valid acc
               _ -> acc
-          -- spawn = simSet next (ChunkData Water) 5 0
-
--- takes in list of valid chunks, as well as the sim to modify
--- updateWaterChunk x y valid sim | trace ("x:" ++ show x ++ " y:" ++ show y ++ " " ++ show valid) False = undefined
-updateWaterChunk x y valid sim =
-    -- if the chunk below is free, fall straight down
-    if elem (0,1) valid && fromEnum (simGetChunkType sim x (y+1)) == fromEnum Air
-        then
-            let moved = simSet sim ChunkData { chunkType=Air } x y
-            in simSet moved ChunkData { chunkType=Water } x (y+1)
-    else if elem (-1,1) valid && fromEnum (simGetChunkType sim (x-1) (y+1)) == fromEnum Air
-        then
-            let moved = simSet sim ChunkData { chunkType=Air } x y
-            in simSet moved ChunkData { chunkType=Water } (x-1) (y+1)
-    else if elem (1,1) valid && fromEnum (simGetChunkType sim (x+1) (y+1)) == fromEnum Air
-        then
-            let moved = simSet sim ChunkData { chunkType=Air } x y
-            in simSet moved ChunkData { chunkType=Water } (x+1) (y+1)
-    else if elem (-1,0) valid && fromEnum (simGetChunkType sim (x-1) y) == fromEnum Air
-        then
-            let moved = simSet sim ChunkData { chunkType=Air } x y
-            in simSet moved ChunkData { chunkType=Water } (x-1) y
-    else if elem (1,0) valid && fromEnum (simGetChunkType sim (x+1) y) == fromEnum Air
-        then
-            let moved = simSet sim ChunkData { chunkType=Air } x y
-            in simSet moved ChunkData { chunkType=Water } (x+1) y
-    -- stay put
-    else sim
-
-updatePumpChunk x y valid sim =
-    if elem (0,1) valid && fromEnum (simGetChunkType sim x (y+1)) == fromEnum Air
-        then simSet sim ChunkData { chunkType=Water } x (y+1)
-    else if elem (-1,0) valid && fromEnum (simGetChunkType sim (x-1) y) == fromEnum Air
-        then simSet sim ChunkData { chunkType=Water } (x-1) y
-    else if elem (1,0) valid && fromEnum (simGetChunkType sim (x+1) y) == fromEnum Air
-        then simSet sim ChunkData { chunkType=Water } (x+1) y
-    else sim
-
-updateDrainChunk x y valid sim =
-    if elem (0,1) valid && fromEnum (simGetChunkType sim x (y+1)) == fromEnum Water
-        then simSet sim ChunkData { chunkType=Air } x (y+1)
-    else if elem (0,-1) valid && fromEnum (simGetChunkType sim x (y-1)) == fromEnum Water
-        then simSet sim ChunkData { chunkType=Air } x (y-1)
-    else if elem (1,0) valid && fromEnum (simGetChunkType sim (x+1) y) == fromEnum Water
-        then simSet sim ChunkData { chunkType=Air } (x+1) y
-    else if elem (-1,0) valid && fromEnum (simGetChunkType sim (x-1) y) == fromEnum Water
-        then simSet sim ChunkData { chunkType=Air } (x-1) y
-    else sim
 
+-- template for update functions
+updateScaffolder x y valid sim directs cond exec =
+    if null directs then sim
+    else if cond (head directs) then exec (head directs)
+    else updateScaffolder x y valid sim (tail directs) cond exec
+
+updateWaterChunk x y valid sim = updateScaffolder x y valid sim
+    [(0,1),(-1,1),(1,1),(-1,0),(1,0)]
+    (\qd ->
+        elem qd valid &&
+        fromEnum (simGetChunkType sim ((+) x $ fst qd) ((+) y $ snd qd)) == fromEnum Air
+    )
+    (\qd -> simSet
+        (simSet sim ChunkData { chunkType=Air } x y)
+        ChunkData { chunkType=Water }
+        ((+) x $ fst qd)
+        ((+) y $ snd qd)
+    )
+
+updatePumpChunk x y valid sim = updateScaffolder x y valid sim
+    [(0,1),(-1,0),(1,0)]
+    (\qd ->
+        elem qd valid &&
+        fromEnum (simGetChunkType sim ((+) x $ fst qd) ((+) y $ snd qd)) == fromEnum Air
+    )
+    (\qd -> simSet sim ChunkData { chunkType=Water } ((+) x $ fst qd) ((+) y $ snd qd))
+
+updateDrainChunk x y valid sim = updateScaffolder x y valid sim
+    [(0,1),(0,-1),(-1,0),(1,0)]
+    (\qd ->
+        elem qd valid &&
+        fromEnum (simGetChunkType sim ((+) x $ fst qd) ((+) y $ snd qd)) == fromEnum Water
+    )
+    (\qd -> simSet sim ChunkData { chunkType=Air } ((+) x $ fst qd) ((+) y $ snd qd))
+    
 -- gets chunks around a given chunk that are inside grid
 -- validDirects x y w h | trace ("w:"++ show w ++ "h:" ++ show h) False = undefined
 validDirects x y w h = filter

diff --git a/samples/blocks b/samples/blocks
index 1e17d7f..0ad9644 100644 (file)
--- a/samples/blocks
+++ b/samples/blocks
@@ -1,4 +1,4 @@
-           #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+           #~~~~~~~~~~~~~~~~~~@@~~~~~~~~~~~~~~~~~~#
            #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
            #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#