Skip to content

Commit a0dfbfa

Browse files
committed
Update submodules
1 parent d981444 commit a0dfbfa

16 files changed

Lines changed: 79 additions & 25 deletions

File tree

OverEditor/src/EditorLayer.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ namespace OverEditor
8787
// DockSpace
8888
static constexpr ImGuiWindowFlags window_flags = ImGuiWindowFlags_NoDocking | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoNavFocus;
8989
ImGuiViewport* viewport = ImGui::GetMainViewport();
90-
ImGui::SetNextWindowPos(viewport->GetWorkPos());
91-
ImGui::SetNextWindowSize(viewport->GetWorkSize());
90+
ImGui::SetNextWindowPos(viewport->Pos);
91+
ImGui::SetNextWindowSize(viewport->Size);
9292
ImGui::SetNextWindowViewport(viewport->ID);
9393

9494
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f);
@@ -142,6 +142,11 @@ namespace OverEditor
142142

143143
ImGui::End();
144144

145+
ImGui::ShowDemoWindow();
146+
ImGui::ShowAboutWindow();
147+
ImGui::ShowStyleEditor();
148+
ImGui::ShowUserGuide();
149+
145150
OnProjectManagerGUI();
146151

147152
if (m_EditingProject)
@@ -260,7 +265,7 @@ namespace OverEditor
260265
#ifdef OE_PLATFORM_WINDOWS
261266
auto project = CreateRef<EditorProject>("D:/overenginedev/SuperMario/project.oep");
262267
#elif defined(OE_PLATFORM_LINUX)
263-
auto project = CreateRef<EditorProject>("/home/sepehr/dev/SuperMario/project.oep");
268+
auto project = CreateRef<EditorProject>("/mnt/Data/Stuff/overenginedev/SuperMario/project.oep");
264269
#endif
265270
m_EditingProject = project;
266271

OverEditor/src/UI/Panels/SceneHierarchyPanel.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,15 @@ namespace OverEditor
8888
{
8989
Entity selectedEntity{ *m_Context->Selection, m_Context->GetActiveScene().get() };
9090

91-
{
92-
fmt::basic_memory_buffer<char, 100> buffer;
93-
*fmt::format_to(buffer, "INSPECTOR_ENTITY_EDITOR{}", selectedEntity.GetRuntimeID()) = '\0';
94-
ImGui::PushID(buffer.data());
95-
96-
buffer.clear();
97-
*fmt::format_to(buffer, "0x{0:x}", selectedEntity.GetComponent<IDComponent>().ID) = '\0';
98-
ImGui::InputText(buffer.data(), &selectedEntity.GetComponent<NameComponent>().Name);
99-
}
91+
// {
92+
// fmt::basic_memory_buffer<char, 100> buffer;
93+
// *fmt::format_to(buffer, "INSPECTOR_ENTITY_EDITOR{}", selectedEntity.GetRuntimeID()) = '\0';
94+
// ImGui::PushID(buffer.data());
95+
96+
// buffer.clear();
97+
// *fmt::format_to(buffer, "0x{0:x}", selectedEntity.GetComponent<IDComponent>().ID) = '\0';
98+
// ImGui::InputText(buffer.data(), &selectedEntity.GetComponent<NameComponent>().Name);
99+
// }
100100

101101
ImGui::Text("RuntimeID: %i", selectedEntity.GetRuntimeID());
102102

OverEngine/premake5.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ project "OverEngine"
8383
defines
8484
{
8585
"GLFW_INCLUDE_NONE",
86-
"YAML_CPP_STATIC_DEFINE",
86+
"YAML_CPP_STATIC_DEFINE"
8787
}
8888

8989
filter "system:windows"

OverEngine/src/OverEngine/Core/Log.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ namespace OverEngine
1515
logSinks.emplace_back(std::make_shared<spdlog::sinks::stdout_color_sink_mt>());
1616
logSinks.emplace_back(std::make_shared<spdlog::sinks::basic_file_sink_mt>("OverEngine.log", true));
1717

18-
// logSinks[0]->set_pattern("%^[%T] %n: %v%$");
19-
logSinks[0]->set_pattern("\033[37m[%T]\033[0m %^%l%$ \033[37m%n:\033[0m %v");
20-
logSinks[1]->set_pattern("[%T] [%l] %n: %v");
18+
logSinks[0]->set_pattern("[%Y-%m-%d %H:%M:%S.%e] %n@%^%l%$ %g%#%!: %v");
19+
logSinks[1]->set_pattern("[%T] [%l] [thread %t] %n: %v");
2120

2221
s_CoreLogger = std::make_shared<spdlog::logger>("OverEngine", std::begin(logSinks), std::end(logSinks));
2322
spdlog::register_logger(s_CoreLogger);

OverEngine/src/Platform/Linux/LinuxWindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ namespace OverEngine
6767
m_Context->Init();
6868

6969
glfwSetWindowUserPointer(m_Window, &m_Data);
70-
SetVSync(true);
70+
SetVSync(false);
7171

7272
// Set GLFW callbacks
7373
glfwSetWindowSizeCallback(m_Window, [](GLFWwindow* window, int width, int height)

OverEngine/src/Platform/OpenGL/OpenGLFrameBuffer.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ namespace OverEngine
3535
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, m_Props.Width, m_Props.Height, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
3636
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
3737
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
38-
3938
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_ColorAttachment, 0);
4039

4140
glCreateTextures(GL_TEXTURE_2D, 1, &m_DepthAttachment);

OverEngine/src/Platform/Windows/WindowsWindow.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
#include "OverEngine/Renderer/GraphicsContext.h"
1111
#include "OverEngine/Renderer/RendererAPI.h"
1212

13+
#define GLFW_EXPOSE_NATIVE_WIN32
14+
#include <GLFW/glfw3native.h>
15+
16+
1317
namespace OverEngine
1418
{
1519
uint32_t WindowsWindow::s_WindowCount = 0;
@@ -62,6 +66,8 @@ namespace OverEngine
6266

6367
m_Window = glfwCreateWindow((int)props.Width, (int)props.Height, m_Data.Title.c_str(), nullptr, nullptr);
6468
s_WindowCount++;
69+
70+
SetWindowDisplayAffinity(glfwGetWin32Window(m_Window), WDA_MONITOR);
6571

6672
m_Context = GraphicsContext::Create(this);
6773
m_Context->Init();

OverEngine/vendor/GLFW

Submodule GLFW updated 110 files

OverEngine/vendor/spdlog

Submodule spdlog updated 160 files

0 commit comments

Comments
 (0)