X-Git-Url: https://git.danieliu.xyz/?p=ekitaihs.git;a=blobdiff_plain;f=Sim.hs;h=beb3d2ca812834b2f46d9c80fb641966f74e831c;hp=fe8c4026002a2531790600ade52b4e6e0cf08c50;hb=HEAD;hpb=0320d5e4f8a290f56c382f81d5443508aea30761

diff --git a/Sim.hs b/Sim.hs
index fe8c402..beb3d2c 100644
--- a/Sim.hs
+++ b/Sim.hs
@@ -2,12 +2,13 @@ module Sim (
     Simulation, simSpace,
     ChunkType, ChunkData, chunkType,
     initSimSpace, testSim, physStep, validDirects,
-    simToString 
+    simToString, stringToSim
 ) where
 
 import Debug.Trace
 import           Data.Vector ((!), (//))
 import qualified Data.Vector as V
+import Data.List as L
 
 data Simulation = Simulation
     { simSpace          :: V.Vector ChunkData
@@ -17,7 +18,9 @@ data Simulation = Simulation
 
 data ChunkType = Air
     | Water 
-    | Wall deriving (Show, Enum)
+    | Wall
+    | Pump
+    | Drain deriving (Show, Enum)
 
 data ChunkData = ChunkData 
     { chunkType         :: ChunkType
@@ -35,7 +38,7 @@ initSimSpace x y = Simulation
     }
 
 testSim = let a = simSet (initSimSpace 10 10) (ChunkData Water) 5 5 
-          in simSet a (ChunkData Wall) 5 4
+          in simSet a (ChunkData Wall) 5 6
 
 physStep sim@Simulation{simW=w,simH=h} = _physStep [(x, y) | x <- [0..w-1], y <- [0..h-1]] sim sim
 -- _physStep grid acc sim@Simulation{simSpace=s,simW=w,simH=h} | trace ("" ++ show h) False = undefined
@@ -47,52 +50,102 @@ _physStep grid acc sim@Simulation{simSpace=s,simW=w,simH=h} =
           valid = validDirects x y w h
           next = case simGetChunkType sim x y of
               Water -> updateWaterChunk x y valid acc
+              Pump -> updatePumpChunk x y valid acc
+              Drain -> updateDrainChunk x y valid acc
               _ -> acc
 
--- 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)
-    -- stay put
-    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) : (waterRandom [(-1,1),(1,1),(-1,0),(1,0)] x y))
+    (\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)
+    )
+
+-- really stupid pure psuedorandom
+waterRandom d x y =
+    let perm = L.permutations d
+    in perm !! ((x^y+x*y^x+x) `mod` (length perm))
+
+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
-    -- (\q -> 0 <= (fst q)+x && (fst q)+x < w && (snd q)+y <= 0 && (snd q)+y < h)
     (\q -> 0 <= (fst q)+x && (fst q)+x < w && 0 <= (snd q)+y && (snd q)+y < h)
     [(a,b) | a <- [-1..1], b <- [-1..1], not (a==0 && b==0)]
 
 simToString :: Simulation -> [Char]
 simToString sim@Simulation{simW=w} = 
     let simStr = V.toList $ V.map chunkToChar $ simSpace sim
-    in insert w '\n' simStr
+    in Sim.insert w '\n' simStr
+
+-- from https://stackoverflow.com/questions/12659562/insert-specific-element-y-after-every-n-elements-in-a-list
+insert :: Int -> a -> [a] -> [a]
+insert n y xs = countdown n xs where
+   countdown 0 xs = y:countdown n xs
+   countdown _ [] = []
+   countdown m (x:xs) = x:countdown (m-1) xs
+
+-- stringToSim :: [String] -> Simulation
+stringToSim strings =
+    _stringToSim st grid (initSimSpace w h)
+    where stripped = strings
+          w = maximum $ [(length s) | s <- stripped]
+          h = length stripped
+          grid = [(a,b) | a <- [0..(length stripped)-1], b <- [0..(length $ stripped !! a)-1]]
+          st = concat stripped
+
+_stringToSim st grid acc =
+    if null grid || null st then acc
+    else _stringToSim (tail st) (tail grid) next
+    where y = fst $ head grid -- not exactly sure why y and x got switched here
+          x = snd $ head grid
+          next = simSet acc (charToChunk $ head st) x y
 
 -- maps each chunktype to an ascii character
 chunkToChar :: ChunkData -> Char
 chunkToChar c =
     case chunkType c of
         Water -> '~'
-        Air -> '.'
+        Air -> ' '
         Wall -> '#'
+        Pump -> '@'
+        Drain -> 'O'
         _ -> '?'
 
--- from https://stackoverflow.com/questions/12659562/insert-specific-element-y-after-every-n-elements-in-a-list
-insert :: Int -> a -> [a] -> [a]
-insert n y xs = countdown n xs where
-   countdown 0 xs = y:countdown n xs
-   countdown _ [] = []
-   countdown m (x:xs) = x:countdown (m-1) xs
+-- this is redundant, fix this somehow
+charToChunk :: Char -> ChunkData
+charToChunk c =
+    ChunkData { chunkType=ctype }
+    where ctype = if c=='~' then Water
+                  else if c=='#' then Wall
+                  else if c=='@' then Pump
+                  else if c=='O' then Drain
+                  else Air