X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=Sim.hs;h=c48dbe4d2194456d72af2cce1db1f8ae925c9df9;hb=b01133aa41dd617c27be81eabe33f90b69cbf618;hp=e96816ed412b0bd102408c06d87bfca524eb86d8;hpb=bdbd06560f50a45aa12c15d4fefa0e3c303fbd7a;p=ekitaihs.git

diff --git a/Sim.hs b/Sim.hs
index e96816e..c48dbe4 100644
--- a/Sim.hs
+++ b/Sim.hs
@@ -1,40 +1,68 @@
-module Sim ( initSimSpace, testSim, physStep ) where
+module Sim ( initSimSpace, testSim, physStep, updateWaterChunk, validDirects ) where
 
+import Debug.Trace
 import           Data.Vector ((!), (//))
 import qualified Data.Vector as V
 
--- Simulation simSpace simW simH
-data Simulation = Simulation (V.Vector ChunkData) Int Int deriving (Show)
+data Simulation = Simulation
+    { simSpace          :: V.Vector ChunkData
+    , simW              :: Int
+    , simH              :: Int
+    } deriving (Show)
 
-data ChunkType = Empty
+data ChunkType = Air
     | Water 
-    | Wall deriving (Show)
+    | Wall deriving (Show, Enum)
 
-data ChunkData = ChunkData ChunkType deriving (Show)
+data ChunkData = ChunkData 
+    { chunkType         :: ChunkType
+    } deriving (Show)
 
 -- vec accessors
-veccGet v w i = v ! i
-simGet (Simulation s w _) i = veccGet s w i
+simGet Simulation{simSpace=s,simW=w} x y = s ! (y*w+x)
+simSet sim@Simulation{simSpace=s,simW=w,simH=h} c x y = sim { simSpace = (s // [(y*w+x,c)]) }
+simGetChunkType sim x y = chunkType $ simGet sim x y
 
-veccSet v w c i = v // [(i,c)]
-simSet (Simulation s w h) c i = Simulation (veccSet s w c i) w h
+initSimSpace x y = Simulation
+    { simSpace = V.replicate (y*x) ChunkData { chunkType=Air }
+    , simW = x
+    , simH = y
+    }
 
-initSimSpace x y = Simulation (V.replicate (y*x) (ChunkData Empty)) x y
+testSim = simSet (initSimSpace 3 3) (ChunkData Water) 1 1
 
-testSim = simSet (initSimSpace 10 10) (ChunkData Water) 5
+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 acc) False = undefined
+_physStep grid acc sim@Simulation{simSpace=s,simW=w,simH=h} =
+    if null grid then acc
+    else _physStep (tail grid) next sim
+    where x = fst $ head grid
+          y = snd $ head grid
+          valid = validDirects x y w h
+          next = case simGetChunkType sim x y of
+              Water -> updateWaterChunk x y valid acc
+              _ -> acc
 
-physStep sim@(Simulation _ w h) = _physStep 0 (initSimSpace w h) sim
-_physStep i acc sim@(Simulation s w h) =
-    if i >= w*h then acc
-    else _physStep (i+1) next sim
-    where
-        getChunkData (ChunkData c) = c
-        next = case getChunkData $ simGet sim i of
-            Water -> sim
-            _ -> sim
+-- takes in list of valid chunks, as well as the sim to modify
+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
 
--- initGaussSeidel s =
---     where h = length s
---           w = length (s V.! 0)
+-- gets chunks around a given chunk that are inside grid
+validDirects x y w h = filter
+    (\q -> 0 <= (fst q) && (fst q) < w && (snd q) <= 0 && (snd q) < h)
+    [(a-x,b-y) | a <- [x-1..x+1], b <- [y-1..y+1], not (a==x && b==y)]
 
--- gaussSeidel