celisej567/Nuake
1
0
Fork 0
mirror of https://github.com/antopilo/Nuake.git synced 2026-09-15 20:08:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Reusing the same code

Browse Source
This commit is contained in:
antopilo
2025-03-01 12:27:18 -05:00
parent f491f51d7b
commit f3e0267623
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Editor/Source/Editor/Windows/EditorInterface.cpp
View File

@@ -2161,9 +2161,9 @@ namespace Nuake {
void EditorInterface::OpenSceneWindow(Ref<Scene> scene)
{
Ref<SceneEditorWindow> sceneEditor = CreateRef<SceneEditorWindow>(scene);
auto sceneEditor = CreateRef<SceneEditorWindow>(scene);
sceneEditor->DockTo(SceneEditorDockspaceNodeID);
sceneEditors.push_back(sceneEditor);
sceneEditors.push_back(std::move(sceneEditor));
}
void EditorInterface::OpenSceneWindow(const std::string& scenePath)
@@ -2326,9 +2326,7 @@ namespace Nuake {
{
Ref<Scene> newScene = Scene::New();
Ref<SceneEditorWindow> sceneEditor = CreateRef<SceneEditorWindow>(newScene);
sceneEditor->DockTo(SceneEditorDockspaceNodeID);
sceneEditors.push_back(sceneEditor);
OpenSceneWindow(newScene);
Selection = EditorSelection();
SetStatusMessage("New scene created.");

26
Editor/Source/Editor/Windows/SceneEditor/Widgets/ViewportWidget.cpp
View File

@@ -17,9 +17,8 @@ ViewportWidget::ViewportWidget(EditorContext& context) : IEditorWidget(context)
const Vector2& defaultSize = { 1280, 720 };
const UUID viewId = editorContext.GetScene()->m_EditorCamera->ID;
auto& vkRenderer = Nuake::VkRenderer::Get();
auto viewport = vkRenderer.CreateViewport(viewId, defaultSize);
vkRenderer.RegisterSceneViewport(context.GetScene(), viewport->GetID());
sceneViewport = viewport;
OnSceneChanged(context.GetScene());
}
ViewportWidget::~ViewportWidget()
@@ -30,8 +29,12 @@ ViewportWidget::~ViewportWidget()
void ViewportWidget::Update(float ts)
{
editorContext.GetScene()->Update(ts);
auto editorCam = (EditorCamera*)(editorContext.GetScene()->GetCurrentCamera().get());
editorCam->Update(ts, isHoveringViewport);
if (!Engine::IsPlayMode())
{
Ref<EditorCamera> editorCam = editorContext.GetScene()->m_EditorCamera;
editorCam->Update(ts, isHoveringViewport);
}
const Vector2 viewportSize = sceneViewport->GetViewportSize();
editorContext.GetScene()->GetCurrentCamera()->OnWindowResize(viewportSize.x, viewportSize.y);
@@ -189,13 +192,18 @@ void ViewportWidget::OnSceneChanged(Ref<Nuake::Scene> scene)
auto& vkRenderer = Nuake::VkRenderer::Get();
// Recreate new viewport with new scene with the same resolution
const Vector2 currentResolution = sceneViewport->GetViewportSize();
Vector2 currentResolution = Vector2{ 1, 1 };
// Remove old viewport
vkRenderer.RemoveViewport(sceneViewport->GetID());
if (sceneViewport)
{
currentResolution = sceneViewport->GetViewportSize();
// Remove old viewport
vkRenderer.RemoveViewport(sceneViewport->GetID());
}
// Create new viewport with same reoslution
const UUID viewId = editorContext.GetScene()->GetCurrentCamera()->ID;
const UUID viewId = editorContext.GetScene()->m_EditorCamera->ID;
auto viewport = vkRenderer.CreateViewport(viewId, currentResolution);
vkRenderer.RegisterSceneViewport(scene, viewport->GetID());