TheZone/ferx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Add editor references and change docking background

Browse Source
This commit is contained in:
Huseyn Ismayilov 2024-11-27 00:01:45 +04:00
parent 7e09d5b537
commit 7f465331c4
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editor/src/Editor.cpp
View File

@ -13,6 +13,16 @@ Editor::~Editor()
Shutdown(); Shutdown();
} }
Editor* Editor::GetInstance()
{
return s_Instance;
}
Engine* Editor::GetEngine()
{
return s_Engine;
}
void Editor::Init() void Editor::Init()
{ {
s_Engine = new Engine(); s_Engine = new Engine();

7
editor/src/GUI.cpp
View File

@ -3,8 +3,7 @@
#include <imgui_impl_opengl3.h> #include <imgui_impl_opengl3.h>
#include "GUI.h" #include "GUI.h"
#include <Editor.h> #include "Editor.h"
#include "FrameBuffer.h" #include "FrameBuffer.h"
#include "Window.h" #include "Window.h"
@ -65,6 +64,7 @@ void GUI::LoadConfigs()
style->TabBarBorderSize = 2.0f; style->TabBarBorderSize = 2.0f;
s_StyleColors[ImGuiCol_WindowBg] = ImVec4(0.14f, 0.14f, 0.14f, 1.0f); s_StyleColors[ImGuiCol_WindowBg] = ImVec4(0.14f, 0.14f, 0.14f, 1.0f);
s_StyleColors[ImGuiCol_DockingEmptyBg] = ImVec4(0.06f, 0.06f, 0.06f, 1.0f);
s_StyleColors[ImGuiCol_Border] = ImVec4(0.06f, 0.06f, 0.06f, 1.0f); s_StyleColors[ImGuiCol_Border] = ImVec4(0.06f, 0.06f, 0.06f, 1.0f);
s_StyleColors[ImGuiCol_PopupBg] = ImVec4(0.06f, 0.06f, 0.06f, 1.0f); s_StyleColors[ImGuiCol_PopupBg] = ImVec4(0.06f, 0.06f, 0.06f, 1.0f);
s_StyleColors[ImGuiCol_FrameBg] = ImVec4(0.09f, 0.09f, 0.09f, 1.0f); s_StyleColors[ImGuiCol_FrameBg] = ImVec4(0.09f, 0.09f, 0.09f, 1.0f);
@ -96,9 +96,6 @@ void GUI::Run()
ImGui_ImplGlfw_NewFrame(); ImGui_ImplGlfw_NewFrame();
ImGui::NewFrame(); ImGui::NewFrame();
ImGui::DockSpaceOverViewport(ImGui::GetMainViewport()); ImGui::DockSpaceOverViewport(ImGui::GetMainViewport());
glm::vec3* clearColor = Renderer::GetData().m_ClearColor;
s_StyleColors[ImGuiCol_DockingEmptyBg] = ImVec4(clearColor->x, clearColor->y, clearColor->z, 1.0f);
} }
void GUI::Render(const FrameBuffer& sceneBuffer) void GUI::Render(const FrameBuffer& sceneBuffer)