Refactor wall zoning, remove streaming

2022-07-23 12:29:29 +01:00
parent 39f4555697
commit 39778f46fb
30 changed files with 396 additions and 163 deletions
@@ -15,38 +15,38 @@ import Data.Graph.Inductive.Graph hiding ((&))
 --import Data.Graph.Inductive.NodeMap
 defaultWorld :: World
 defaultWorld = World
-    { _keys = S.empty
-    , _magnets = IM.empty
-    , _mouseButtons = mempty
-    , _cameraCenter = V2 0 0
-    , _cameraRot = 0
-    , _cameraZoom = 1
-    , _itemZoom     = 1
-    , _defaultZoom = 1
-    , _cameraViewFrom = V2 0 0
-    , _viewDistance = 1000
+    { _keys             = S.empty
+    , _magnets          = IM.empty
+    , _mouseButtons     = mempty
+    , _cameraCenter     = V2 0 0
+    , _cameraRot        = 0
+    , _cameraZoom       = 1
+    , _itemZoom         = 1
+    , _defaultZoom      = 1
+    , _cameraViewFrom   = V2 0 0
+    , _viewDistance     = 1000
    , _modifications    = IM.empty
    , _creatures        = IM.empty
-    , _crZoning         = CrZoning mempty --Zoning IM.empty crZoneSize zoneOfCreature
+    , _crZoning         = mempty --Zoning IM.empty crZoneSize zoneOfCreature
    , _creatureGroups   = IM.empty
    , _clouds           = mempty
    , _clZoning         = Zoning IM.empty clZoneSize (zonePos (stripZ . _clPos))
-    , _gusts = IM.empty
-    , _gsZoning         = Zoning IM.empty clZoneSize (zonePos _guPos)
-    , _itemPositions = IM.empty
-    , _props = IM.empty
-    , _projectiles = IM.empty
-    , _instantBullets = []
-    , _bullets = []
+    , _gusts            = IM.empty
+    , _gsZoning         = mempty --Zoning IM.empty clZoneSize (zonePos _guPos)
+    , _itemPositions    = IM.empty
+    , _props            = IM.empty
+    , _projectiles      = IM.empty
+    , _instantBullets   = []
+    , _bullets          = []
    , _instantParticles = []
-    , _particles = []
-    , _flames = []
-    , _radarSweeps = []
-    , _sparks = []
-    , _posEvents = []
-    , _energyBalls = []
-    , _radarBlips = []
-    , _flares = []
+    , _particles        = []
+    , _flames           = []
+    , _radarSweeps      = []
+    , _sparks           = []
+    , _posEvents        = []
+    , _energyBalls      = []
+    , _radarBlips       = []
+    , _flares           = []
    , _newBeams = WorldBeams [] [] [] []
    , _beams = WorldBeams [] [] [] []
    , _walls = IM.empty
@@ -57,7 +57,7 @@ defaultWorld = World
    , _doors = IM.empty
    , _coordinates  = IM.empty
    , _triggers     = IM.empty
-    , _wlZoning     = Zoning IM.empty wlZoneSize zoneOfWall
+    , _wlZoning     = IM.empty --Zoning IM.empty wlZoneSize zoneOfWall
    , _floorItems = IM.empty
    , _floorTiles = []
    , _randGen = mkStdGen 2
@@ -76,8 +76,8 @@ defaultWorld = World
    , _clickMousePos = V2 0 0
    , _pathGraph = Data.Graph.Inductive.Graph.empty
 --    , _pathGraphP   = mempty
-    , _pnZoning     = Zoning mempty wlZoneSize (zonePos snd)
-    , _peZoning     = Zoning mempty wlZoneSize (\x (_,_,e) -> zoneOfSeg x (_peStart e) (_peEnd e))
+    , _pnZoning     = Zoning mempty peZoneSize (zonePos snd)
+    , _peZoning     = Zoning mempty peZoneSize (\x (_,_,e) -> zoneOfSeg x (_peStart e) (_peEnd e))
    , _hud = HUD
        { _hudElement = DisplayInventory NoSubInventory
        , _carteCenter = V2 0 0