From f0d762b8a175f25133303fec0a4b116a09f1518b Mon Sep 17 00:00:00 2001 From: antopilo Date: Sat, 8 Feb 2025 18:38:53 -0500 Subject: [PATCH] Camera switching between playmode/editor mode now working properly --- Editor/Source/Editor/Windows/EditorInterface.cpp | 2 ++ .../Editor/Windows/SceneEditor/Widgets/ViewportWidget.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Editor/Source/Editor/Windows/EditorInterface.cpp b/Editor/Source/Editor/Windows/EditorInterface.cpp index 68852335..80807b56 100644 --- a/Editor/Source/Editor/Windows/EditorInterface.cpp +++ b/Editor/Source/Editor/Windows/EditorInterface.cpp @@ -424,6 +424,8 @@ namespace Nuake { PushCommand(SetGameState(GameState::Playing)); std::string statusMessage = ICON_FA_RUNNING + std::string(" Playing..."); SetStatusMessage(statusMessage.c_str(), Engine::GetProject()->Settings.PrimaryColor); + + GetFocusedSceneEditor()->SetScene(GetFocusedSceneEditor()->GetScene()); } }); } diff --git a/Editor/Source/Editor/Windows/SceneEditor/Widgets/ViewportWidget.cpp b/Editor/Source/Editor/Windows/SceneEditor/Widgets/ViewportWidget.cpp index 1aa012fa..286265e7 100644 --- a/Editor/Source/Editor/Windows/SceneEditor/Widgets/ViewportWidget.cpp +++ b/Editor/Source/Editor/Windows/SceneEditor/Widgets/ViewportWidget.cpp @@ -195,7 +195,7 @@ void ViewportWidget::OnSceneChanged(Ref scene) vkRenderer.RemoveViewport(sceneViewport->GetID()); // Create new viewport with same reoslution - const UUID viewId = editorContext.GetScene()->m_EditorCamera->ID; + const UUID viewId = editorContext.GetScene()->GetCurrentCamera()->ID; auto viewport = vkRenderer.CreateViewport(viewId, currentResolution); vkRenderer.RegisterSceneViewport(scene, viewport->GetID());