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

diff --git a/Sim.hs b/Sim.hs
index e96816e..8dd5819 100644
--- a/Sim.hs
+++ b/Sim.hs
@@ -4,37 +4,46 @@ 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
     | Water 
     | Wall deriving (Show)
 
-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)]) }
+
+initSimSpace x y = Simulation
+    { simSpace = V.replicate (y*x) ChunkData { chunkType=Empty }
+    , simW = x
+    , simH = y
+    }
+
+testSim = simSet (initSimSpace 10 10) (ChunkData Water) 5 0
+
+physStep sim@Simulation{simW=w,simH=h} = _physStep [(x, y) | x <- [0..w-1], y <- [0..h-1]] (initSimSpace w h) sim
+_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
+          next = sim
+
+-- takes in list of valid chunks, as well as the sim to modify
+-- updateWaterChunk valid sim =
+    
+
+-- 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,b) | a <- [x-1..x+1], b <- [y-1..y+1], not (a==x && b==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 (V.replicate (y*x) (ChunkData Empty)) x y
-
-testSim = simSet (initSimSpace 10 10) (ChunkData Water) 5
-
-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
-
--- initGaussSeidel s =
---     where h = length s
---           w = length (s V.! 0)
-
--- gaussSeidel