From ddce1caaed6f3cb292a67100849fae55be5327ca Mon Sep 17 00:00:00 2001 From: Arnau Alier Torres Date: Thu, 15 May 2025 17:24:48 +0200 Subject: [PATCH] Add --- DeerStudio/src/DeerStudio/DeerStudio.cpp | 2 +- DeerStudio/src/DeerStudio/Editor/Viewport.cpp | 4 +- roe/Editor/test.as | 2 +- roe/imgui.ini | 52 +++++++++---------- 4 files changed, 28 insertions(+), 32 deletions(-) diff --git a/DeerStudio/src/DeerStudio/DeerStudio.cpp b/DeerStudio/src/DeerStudio/DeerStudio.cpp index eee97c8..1358857 100755 --- a/DeerStudio/src/DeerStudio/DeerStudio.cpp +++ b/DeerStudio/src/DeerStudio/DeerStudio.cpp @@ -131,7 +131,7 @@ namespace Deer { // ---- PanelS ----- TerrainEditor::onImGui(); - //viewport_onImGui(); + viewport_onImGui(); EditorEngine::execute(); // ---- PanelS ----- Scene::gizmoRenderer.refresh(); diff --git a/DeerStudio/src/DeerStudio/Editor/Viewport.cpp b/DeerStudio/src/DeerStudio/Editor/Viewport.cpp index b18228b..a02eee5 100755 --- a/DeerStudio/src/DeerStudio/Editor/Viewport.cpp +++ b/DeerStudio/src/DeerStudio/Editor/Viewport.cpp @@ -56,9 +56,7 @@ namespace Deer { {TextureBufferType::RGBA8, TextureBufferType::RED_INTEGER}, 4, false))); } - m_frameBuffer->unbind(); - return; - + ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f)); ImGui::Begin("Viewport"); diff --git a/roe/Editor/test.as b/roe/Editor/test.as index b700616..5bc96f1 100644 --- a/roe/Editor/test.as +++ b/roe/Editor/test.as @@ -5,7 +5,7 @@ class Test : DockPanel { void onRender() { if (!activeEntity.hasCameraComponent()) return; - + text("Works"); frameBuffer.clearRGBA(0, 0, 0, 255); diff --git a/roe/imgui.ini b/roe/imgui.ini index 216dd4f..17d8675 100644 --- a/roe/imgui.ini +++ b/roe/imgui.ini @@ -16,9 +16,9 @@ DockId=0x00000004,1 [Window][Game Window] Pos=377,24 -Size=504,520 +Size=532,462 Collapsed=0 -DockId=0x00000009,0 +DockId=0x00000006,0 [Window][Tree Panel] Pos=0,24 @@ -27,16 +27,16 @@ Collapsed=0 DockId=0x00000001,0 [Window][Terrain Editor] -Pos=883,24 -Size=397,520 +Pos=911,24 +Size=369,462 Collapsed=0 DockId=0x00000004,0 [Window][Viewport] -Pos=369,24 -Size=471,696 +Pos=377,24 +Size=532,462 Collapsed=0 -DockId=0x0000000A,0 +DockId=0x00000006,2 [Window][Scene Explorer] Pos=0,389 @@ -57,14 +57,14 @@ Collapsed=0 DockId=0x00000008,1 [Window][MeshExplorer] -Pos=0,546 -Size=1280,174 +Pos=0,488 +Size=1280,232 Collapsed=0 DockId=0x00000008,0 [Window][TreePannel] Pos=0,24 -Size=375,520 +Size=375,462 Collapsed=0 DockId=0x00000005,0 @@ -79,8 +79,8 @@ Size=351,75 Collapsed=0 [Window][PropertiesPannel] -Pos=883,24 -Size=397,520 +Pos=911,24 +Size=369,462 Collapsed=0 DockId=0x00000004,1 @@ -91,27 +91,25 @@ Collapsed=0 DockId=0x00000004,1 [Window][ShaderExplorer] -Pos=0,546 -Size=1280,174 +Pos=0,488 +Size=1280,232 Collapsed=0 DockId=0x00000008,1 [Window][Test] Pos=377,24 -Size=504,520 +Size=532,462 Collapsed=0 -DockId=0x00000009,1 +DockId=0x00000006,1 [Docking][Data] -DockSpace ID=0xA1672E74 Window=0x4647B76E Pos=0,24 Size=1280,696 Split=Y - DockNode ID=0x00000007 Parent=0xA1672E74 SizeRef=1280,520 Split=Y - DockNode ID=0x00000001 Parent=0x00000007 SizeRef=2560,363 Split=X Selected=0x13926F0B - DockNode ID=0x00000003 Parent=0x00000001 SizeRef=881,338 Split=X Selected=0x13926F0B - DockNode ID=0x00000005 Parent=0x00000003 SizeRef=375,446 Selected=0xE45B9F93 - DockNode ID=0x00000006 Parent=0x00000003 SizeRef=504,446 Split=X Selected=0x44A6A033 - DockNode ID=0x00000009 Parent=0x00000006 SizeRef=367,520 CentralNode=1 Selected=0x44A6A033 - DockNode ID=0x0000000A Parent=0x00000006 SizeRef=471,520 Selected=0x13926F0B - DockNode ID=0x00000004 Parent=0x00000001 SizeRef=397,338 Selected=0xA35A27E3 - DockNode ID=0x00000002 Parent=0x00000007 SizeRef=2560,331 Selected=0xCF339702 - DockNode ID=0x00000008 Parent=0xA1672E74 SizeRef=1280,174 Selected=0xD962995A +DockSpace ID=0xA1672E74 Window=0x4647B76E Pos=0,24 Size=1280,696 Split=Y + DockNode ID=0x00000007 Parent=0xA1672E74 SizeRef=1280,462 Split=Y + DockNode ID=0x00000001 Parent=0x00000007 SizeRef=2560,363 Split=X Selected=0x13926F0B + DockNode ID=0x00000003 Parent=0x00000001 SizeRef=909,338 Split=X Selected=0x13926F0B + DockNode ID=0x00000005 Parent=0x00000003 SizeRef=375,446 Selected=0xE45B9F93 + DockNode ID=0x00000006 Parent=0x00000003 SizeRef=532,446 CentralNode=1 Selected=0x13926F0B + DockNode ID=0x00000004 Parent=0x00000001 SizeRef=369,338 Selected=0xA35A27E3 + DockNode ID=0x00000002 Parent=0x00000007 SizeRef=2560,331 Selected=0xCF339702 + DockNode ID=0x00000008 Parent=0xA1672E74 SizeRef=1280,232 Selected=0xD962995A