Nest fields in CWorld

src/Dodge/Default/World.hs

@@ -1,6 +1,5 @@
 module Dodge.Default.World where
 
-import MaybeHelp
 import Data.Graph.Inductive.Graph hiding ((&))
 import qualified Data.Map as M
 import qualified Data.Set as S
@@ -8,6 +7,7 @@ import Dodge.Data.World
 import Geometry.Data
 import Geometry.Polygon
 import qualified IntMapHelp as IM
+import MaybeHelp
 import System.Random
 
 --import Data.Graph.Inductive.NodeMap
@@ -33,8 +33,19 @@ defaultWorld =
         , _rbOptions = NoRightButtonOptions
         }
 
+defaultCWGen :: CWGen
+defaultCWGen =
+    CWGen
+        { _cwgParams = GenParams M.empty
+        , _cwgSeed = 0
+        , _cwgWorldBounds = defaultBounds
+        , _cwgGameRooms = []
+        , _cwgRoomClipping = []
+        }
+
 defaultCWCam :: CWCam
-defaultCWCam = CWCam
+defaultCWCam =
+    CWCam
         { _cwcCenter = V2 0 0
         , _cwcRot = 0
         , _cwcZoom = 1
@@ -45,12 +56,12 @@ defaultCWCam = CWCam
         , _cwcBoundBox = square 100
         , _cwcBoundDist = (100, -100, 100, -100)
         }
-    
 
 defaultCWorld :: CWorld
 defaultCWorld =
     CWorld
         { _cwCam = defaultCWCam
+        , _cwGen = defaultCWGen
         , _magnets = IM.empty
         , _modifications = IM.empty
         , _creatures = IM.empty
@@ -120,15 +131,10 @@ defaultCWorld =
         , _selLocation = 0
         , _foregroundShapes = mempty
         , _distortions = []
-        , _gameRooms = []
-        , _roomClipping = []
         , _worldClock = 0
-        , _worldBounds = defaultBounds
         , _maybeWorld = Nothing'
         , _rewindWorlds = []
-        , _genParams = GenParams M.empty
         , _deathDelay = Nothing
-        , _cwSeed = 0
         }
 
 defaultWorldHammers :: M.Map WorldHammer HammerPosition