Add general smooth scrolling, move camera into world

2023-03-26 20:09:00 +01:00
parent 73e742e1a2
commit 07a1d71039
32 changed files with 154 additions and 131 deletions
@@ -23,6 +23,7 @@ defaultInput =
        , _mouseMoving = False
        , _scrollAmount = 0
        , _previousScrollAmount = 0
+        , _smoothScrollAmount = 0
        , _lrLine = (0, 0)
        , _lLine = (0, 0)
        , _rLine = (0, 0)
@@ -36,6 +37,7 @@ defaultWorld :: World
 defaultWorld =
    World
        { _cWorld = defaultCWorld
+        , _wCam = defaultCWCam
        , _pastWorlds = mempty
        , _timeFlow = NormalTimeFlow
        , _input = defaultInput
@@ -82,8 +84,7 @@ defaultCWCam =
 defaultCWorld :: CWorld
 defaultCWorld =
    CWorld
-        { _cwCam = defaultCWCam
-        , _lWorld = defaultLWorld
+        { _lWorld = defaultLWorld
        , _cwGen = defaultCWGen
        , _cClock = 0
        , _seenWalls = mempty