Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Preserve the world camera when switching to/from split view #6576

Merged
merged 6 commits into from
Dec 25, 2024
Merged

Preserve the world camera when switching to/from split view #6576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
12c9a59
Preserve the world camera when switching to/from split view
Garanas Dec 5, 2024
5ddd57d
Add a snippet
Garanas Dec 5, 2024
5474cbd
Update changelog/snippets/features.6576.md
Garanas Dec 9, 2024
16e12f4
Undo line breaks
lL1l1 Dec 25, 2024
c071a4e
Unset lua formatter max line length
lL1l1 Dec 25, 2024
401077d
Re-add a line break
lL1l1 Dec 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
"Lua.runtime.exportEnvDefault": true,
"Lua.completion.autoRequire": false,
"Lua.diagnostics.globals": ["ScenarioInfo"],
"Lua.format.defaultConfig": {
"max_line_length": "unset",
},

// used for grammar checks of changelog
"grammarly.files.include": [
Expand Down
3 changes: 3 additions & 0 deletions changelog/snippets/features.6576.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- (#6576) Preserve the world camera when switching to/from split view

When you switch to/from split view the primary camera (the left camera) is now preserved. This makes it less disorientating for a player (or caster) to switch to/from split view.
23 changes: 21 additions & 2 deletions lua/ui/game/worldview.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ local function CreatePositionMarker(army, worldView)
marker.frame.Depth:Set(marker:Depth() - 1)

marker.name = UIUtil.CreateText(marker, data.name, 12, UIUtil.bodyFont)
marker.name:DisableHitTest()
marker.name:DisableHitTest()
marker.name:SetColor('white')

if Factions[data.faction] then
Expand Down Expand Up @@ -120,7 +120,7 @@ function MarkStartPositions(startPositions)
local faction = armyData.faction + 1
local color = armyData.color

positionMarkers[armyId] = {army = armyId, pos = pos, name = name, faction = faction, color = color, views = 0}
positionMarkers[armyId] = { army = armyId, pos = pos, name = name, faction = faction, color = color, views = 0 }

for viewName, view in MapControls do
if viewName ~= 'MiniMap' then
Expand All @@ -132,6 +132,16 @@ function MarkStartPositions(startPositions)
end

function CreateMainWorldView(parent, mapGroup, mapGroupRight)
-- feature: preserve the world camera when changing views
---@type UserCamera
local worldCamera = GetCamera('WorldCamera')

---@type UserCameraSettings | nil
local worldCameraSettings = nil
if worldCamera then
worldCameraSettings = worldCamera:SaveSettings()
end

if viewLeft then
viewLeft:Destroy()
viewLeft = false
Expand Down Expand Up @@ -176,6 +186,15 @@ function CreateMainWorldView(parent, mapGroup, mapGroupRight)
view:DisableHitTest()
LayoutHelpers.FillParent(view, viewLeft)
end

-- feature: preserve the world camera when changing views
if worldCameraSettings then
local newWorldCamera = GetCamera('WorldCamera')
if newWorldCamera then
newWorldCamera:RestoreSettings(worldCameraSettings)
end
end

import("/lua/ui/game/multifunction.lua").RefreshMapDialog()
end

Expand Down
Loading