Commit before static wall overhaul

This commit is contained in:
jgk
2021-07-19 01:33:52 +02:00
parent e657d8e852
commit 6905c6f154
17 changed files with 58 additions and 51 deletions
+9 -2
View File
@@ -42,7 +42,7 @@ import Data.Int (Int16)
import qualified Data.Set as S
import qualified Data.IntSet as IS
import qualified Data.IntMap.Strict as IM
import qualified Data.Map as M
import qualified Data.Map.Strict as M
import SDL (Scancode, MouseButton)
data World = World
{ _keys :: !(S.Set Scancode)
@@ -59,7 +59,8 @@ data World = World
, _cloudsZone :: IM.IntMap (IM.IntMap (IM.IntMap Cloud))
, _projectiles :: IM.IntMap Projectile
, _particles :: ![Particle]
, _staticWalls :: [Wall]
, _staticWalls :: IM.IntMap (IM.IntMap [Wall'])
, _seenStaticWalls :: IM.IntMap (IM.IntMap [Wall'])
, _walls :: !(IM.IntMap Wall)
, _wallsZone :: IM.IntMap (IM.IntMap (IM.IntMap Wall))
, _forceFields :: IM.IntMap ForceField
@@ -446,6 +447,12 @@ data Projectile
, _pjTimer :: Int
}
data Either3 a b c = E3x1 a | E3x2 b | E3x3 c
data Wall' = Wall'
{ _wlLine' :: (Point2,Point2)
, _wlColor' :: Color
}
data Wall
= Wall
{ _wlLine :: (Point2,Point2)