Move camera settings to a menu script

files/data/builtin.omwscripts

@@ -13,6 +13,7 @@ GLOBAL: scripts/omw/usehandlers.lua
 GLOBAL: scripts/omw/worldeventhandlers.lua
 PLAYER: scripts/omw/mechanics/playercontroller.lua
 PLAYER: scripts/omw/playercontrols.lua
+MENU: scripts/omw/camera/settings.lua
 PLAYER: scripts/omw/camera/camera.lua
 PLAYER: scripts/omw/input/actionbindings.lua
 PLAYER: scripts/omw/input/smoothmovement.lua

files/data/scripts/omw/camera/camera.lua

@@ -5,6 +5,7 @@ local util = require('openmw.util')
 local self = require('openmw.self')
 local nearby = require('openmw.nearby')
 local async = require('openmw.async')
+local storage = require('openmw.storage')
 local I = require('openmw.interfaces')
 
 local Actor = require('openmw.types').Actor
@@ -28,7 +29,7 @@ input.registerAction {
     defaultValue = 0,
 }
 
-local settings = require('scripts.omw.camera.settings').thirdPerson
+local settings = storage.playerSection('SettingsOMWCameraThirdPerson')
 local head_bobbing = require('scripts.omw.camera.head_bobbing')
 local third_person = require('scripts.omw.camera.third_person')
 local pov_auto_switch = require('scripts.omw.camera.first_person_auto_switch')

files/data/scripts/omw/camera/head_bobbing.lua

@@ -2,12 +2,13 @@ local camera = require('openmw.camera')
 local self = require('openmw.self')
 local util = require('openmw.util')
 local async = require('openmw.async')
+local storage = require('openmw.storage')
 
 local Actor = require('openmw.types').Actor
 
 local M = {}
 
-local settings = require('scripts.omw.camera.settings').headBobbing
+local settings = storage.playerSection('SettingsOMWCameraHeadBobbing')
 
 local doubleStepLength, stepHeight, maxRoll
 
@@ -58,4 +59,3 @@ function M.update(dt, smoothedSpeed)
 end
 
 return M
-

files/data/scripts/omw/camera/settings.lua

@@ -16,8 +16,8 @@ local function boolSetting(prefix, key, default)
     return {
         key = key,
         renderer = 'checkbox',
-        name = prefix..key,
-        description = prefix..key..'Description',
+        name = prefix .. key,
+        description = prefix .. key .. 'Description',
         default = default,
     }
 end
@@ -26,8 +26,8 @@ local function floatSetting(prefix, key, default)
     return {
         key = key,
         renderer = 'number',
-        name = prefix..key,
-        description = prefix..key..'Description',
+        name = prefix .. key,
+        description = prefix .. key .. 'Description',
         default = default,
     }
 end
@@ -70,33 +70,29 @@ I.Settings.registerGroup({
     },
 })
 
-local settings = {
-    thirdPerson = storage.playerSection(thirdPersonGroup),
-    headBobbing = storage.playerSection(headBobbingGroup),
-}
+local thirdPerson = storage.playerSection(thirdPersonGroup)
+local headBobbing = storage.playerSection(headBobbingGroup)
 
 local function updateViewOverShoulderDisabled()
-    local shoulderDisabled = not settings.thirdPerson:get('viewOverShoulder')
-    I.Settings.updateRendererArgument(thirdPersonGroup, 'shoulderOffsetX', {disabled = shoulderDisabled})
-    I.Settings.updateRendererArgument(thirdPersonGroup, 'shoulderOffsetY', {disabled = shoulderDisabled})
-    I.Settings.updateRendererArgument(thirdPersonGroup, 'autoSwitchShoulder', {disabled = shoulderDisabled})
-    I.Settings.updateRendererArgument(thirdPersonGroup, 'zoomOutWhenMoveCoef', {disabled = shoulderDisabled})
+    local shoulderDisabled = not thirdPerson:get('viewOverShoulder')
+    I.Settings.updateRendererArgument(thirdPersonGroup, 'shoulderOffsetX', { disabled = shoulderDisabled })
+    I.Settings.updateRendererArgument(thirdPersonGroup, 'shoulderOffsetY', { disabled = shoulderDisabled })
+    I.Settings.updateRendererArgument(thirdPersonGroup, 'autoSwitchShoulder', { disabled = shoulderDisabled })
+    I.Settings.updateRendererArgument(thirdPersonGroup, 'zoomOutWhenMoveCoef', { disabled = shoulderDisabled })
 
-    local move360Disabled = not settings.thirdPerson:get('move360')
-    I.Settings.updateRendererArgument(thirdPersonGroup, 'move360TurnSpeed', {disabled = move360Disabled})
+    local move360Disabled = not thirdPerson:get('move360')
+    I.Settings.updateRendererArgument(thirdPersonGroup, 'move360TurnSpeed', { disabled = move360Disabled })
 end
 
 local function updateHeadBobbingDisabled()
-    local disabled = not settings.headBobbing:get('enabled')
-    I.Settings.updateRendererArgument(headBobbingGroup, 'step', {disabled = disabled, min = 1})
-    I.Settings.updateRendererArgument(headBobbingGroup, 'height', {disabled = disabled})
-    I.Settings.updateRendererArgument(headBobbingGroup, 'roll', {disabled = disabled, min = 0, max = 90})
+    local disabled = not headBobbing:get('enabled')
+    I.Settings.updateRendererArgument(headBobbingGroup, 'step', { disabled = disabled, min = 1 })
+    I.Settings.updateRendererArgument(headBobbingGroup, 'height', { disabled = disabled })
+    I.Settings.updateRendererArgument(headBobbingGroup, 'roll', { disabled = disabled, min = 0, max = 90 })
 end
 
 updateViewOverShoulderDisabled()
 updateHeadBobbingDisabled()
 
-settings.thirdPerson:subscribe(async:callback(updateViewOverShoulderDisabled))
-settings.headBobbing:subscribe(async:callback(updateHeadBobbingDisabled))
-
-return settings
+thirdPerson:subscribe(async:callback(updateViewOverShoulderDisabled))
+headBobbing:subscribe(async:callback(updateHeadBobbingDisabled))

files/data/scripts/omw/camera/third_person.lua

@@ -3,10 +3,11 @@ local util = require('openmw.util')
 local self = require('openmw.self')
 local nearby = require('openmw.nearby')
 local async = require('openmw.async')
+local storage = require('openmw.storage')
 
 local Actor = require('openmw.types').Actor
 
-local settings = require('scripts.omw.camera.settings').thirdPerson
+local settings = storage.playerSection('SettingsOMWCameraThirdPerson')
 
 local MODE = camera.MODE
 local STATE = { RightShoulder = 0, LeftShoulder = 1, Combat = 2, Swimming = 3 }
@@ -46,7 +47,7 @@ local state = defaultShoulder
 
 local function ray(from, angle, limit)
     local to = from + util.transform.rotateZ(angle) * util.vector3(0, limit, 0)
-    local res = nearby.castRay(from, to, {collisionType = camera.getCollisionType()})
+    local res = nearby.castRay(from, to, { collisionType = camera.getCollisionType() })
     if res.hit then
         return (res.hitPos - from):length()
     else
@@ -79,7 +80,7 @@ end
 local function calculateDistance(smoothedSpeed)
     local smoothedSpeedSqr = smoothedSpeed * smoothedSpeed
     return (M.baseDistance + math.max(camera.getPitch(), 0) * 50
-            + smoothedSpeedSqr / (smoothedSpeedSqr + 300*300) * zoomOutWhenMoveCoef)
+        + smoothedSpeedSqr / (smoothedSpeedSqr + 300 * 300) * zoomOutWhenMoveCoef)
 end
 
 local function updateState()
@@ -161,4 +162,3 @@ function M.update(dt, smoothedSpeed)
 end
 
 return M
-