Merge branch 'testing', resolved conflicts

2021-03-27 20:45:36 +01:00
parent 2956fb6379 881359c4ac
commit 326c624210
9 changed files with 3230 additions and 55 deletions
@@ -35,6 +35,8 @@ handlePressedKey _    scancode w
    -- Rotation seems to be duplicated here and in Camera.hs ? why
    |  scancode == rotateCameraPlusKey (_keyConfig w) = Just $ w {_cameraRot = _cameraRot w + 0.01}
    |  scancode == rotateCameraMinusKey (_keyConfig w) = Just $ w {_cameraRot = _cameraRot w - 0.01}
+    |  scancode ==   ScancodeF7      = Just $ w {_varMovementSpeedModifier = _varMovementSpeedModifier w - 1}
+    |  scancode ==   ScancodeF8      = Just $ w {_varMovementSpeedModifier = _varMovementSpeedModifier w + 1}
 handlePressedKey _ _ w = Just w