diff --git a/Specter/src/CMakeLists.txt b/Specter/src/CMakeLists.txt index 1380957..df285ae 100644 --- a/Specter/src/CMakeLists.txt +++ b/Specter/src/CMakeLists.txt @@ -167,7 +167,13 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "Debug") endif() #Some extra defs -target_compile_definitions(Specter PRIVATE GLFW_INCLUDE_NONE YAML_CPP_STATIC_DEFINE IMGUI_IMPL_OPENGL_LOADER_GLAD IMPLOT_BACKEND_ENABLE_OPENGL3) +target_compile_definitions(Specter PRIVATE + GLFW_INCLUDE_NONE + YAML_CPP_STATIC_DEFINE + IMGUI_IMPL_OPENGL_LOADER_GLAD + IMPLOT_BACKEND_ENABLE_OPENGL3 + IMGUI_DEFINE_MATH_OPERATORS +) #set_target_properties(Specter PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${SPECTER_LIBRARY_DIR}) diff --git a/Specter/src/Platform/OpenGL/OpenGLContext.cpp b/Specter/src/Platform/OpenGL/OpenGLContext.cpp index 486b5e3..ff1ead2 100644 --- a/Specter/src/Platform/OpenGL/OpenGLContext.cpp +++ b/Specter/src/Platform/OpenGL/OpenGLContext.cpp @@ -29,9 +29,9 @@ namespace Specter { SPEC_INFO("Loaded OpenGL with glad Init status {0}", status); SPEC_INFO("Loaded OpenGL renderer"); - SPEC_INFO("Vendor: {0}", glGetString(GL_VENDOR)); - SPEC_INFO("Renderer: {0}", glGetString(GL_RENDERER)); - SPEC_INFO("Version: {0}", glGetString(GL_VERSION)); + SPEC_INFO("Vendor: {0}", (const char*)glGetString(GL_VENDOR)); + SPEC_INFO("Renderer: {0}", (const char*)glGetString(GL_RENDERER)); + SPEC_INFO("Version: {0}", (const char*)glGetString(GL_VERSION)); } void OpenGLContext::SwapBuffers() diff --git a/Specter/src/Specter/Editor/EditorLayer.cpp b/Specter/src/Specter/Editor/EditorLayer.cpp index 97d3cc3..72693e4 100644 --- a/Specter/src/Specter/Editor/EditorLayer.cpp +++ b/Specter/src/Specter/Editor/EditorLayer.cpp @@ -217,6 +217,12 @@ namespace Specter { serializer.SerializeData(m_manager); break; } + case FileDialog::Type::OpenDir: + { + SPEC_WARN("Somehow at OpenDir in Editor..."); + return; + } + case FileDialog::Type::None: return; } } diff --git a/Specter/vendor/DaqGrimoire b/Specter/vendor/DaqGrimoire index 2bd094a..62107d2 160000 --- a/Specter/vendor/DaqGrimoire +++ b/Specter/vendor/DaqGrimoire @@ -1 +1 @@ -Subproject commit 2bd094a97c4b244452fe04f2af12b1c8d469894e +Subproject commit 62107d22015fd8f42a7123a0ee9b77d3353fbbeb diff --git a/Specter/vendor/IconFontCppHeaders b/Specter/vendor/IconFontCppHeaders index 7d6ff1f..90da802 160000 --- a/Specter/vendor/IconFontCppHeaders +++ b/Specter/vendor/IconFontCppHeaders @@ -1 +1 @@ -Subproject commit 7d6ff1f4ba51e7a2b142be39457768abece1549c +Subproject commit 90da8021ec7c7792c454c3f43516595754a91765 diff --git a/Specter/vendor/asio b/Specter/vendor/asio index f0a1e1c..c465349 160000 --- a/Specter/vendor/asio +++ b/Specter/vendor/asio @@ -1 +1 @@ -Subproject commit f0a1e1c7c0387ad16358c81eb52528f190df625c +Subproject commit c465349fa5cd91a64bb369f5131ceacab2c0c1c3 diff --git a/Specter/vendor/glfw b/Specter/vendor/glfw index facec25..a3005b6 160000 --- a/Specter/vendor/glfw +++ b/Specter/vendor/glfw @@ -1 +1 @@ -Subproject commit facec25e0e1f1ef91ad8db3c5327d518f49901fd +Subproject commit a3005b6cbe25a34a7e4e7c85fc8197305b5a0617 diff --git a/Specter/vendor/glm b/Specter/vendor/glm index cc98465..5c46b9c 160000 --- a/Specter/vendor/glm +++ b/Specter/vendor/glm @@ -1 +1 @@ -Subproject commit cc98465e3508535ba8c7f6208df934c156a018dc +Subproject commit 5c46b9c07008ae65cb81ab79cd677ecc1934b903 diff --git a/Specter/vendor/imgui b/Specter/vendor/imgui index de3d857..b6ec477 160000 --- a/Specter/vendor/imgui +++ b/Specter/vendor/imgui @@ -1 +1 @@ -Subproject commit de3d857a54fcc665921be03d72b20f68c1e3f98d +Subproject commit b6ec477b0b43d89d280d28c674095be7782cba79 diff --git a/Specter/vendor/implot b/Specter/vendor/implot index 8250340..c2b30bc 160000 --- a/Specter/vendor/implot +++ b/Specter/vendor/implot @@ -1 +1 @@ -Subproject commit 8250340f04fe86174a75544e73a759cedcb658f3 +Subproject commit c2b30bc47b8c2efc3d1e81fc63ec374d13e5e661 diff --git a/Specter/vendor/spdlog b/Specter/vendor/spdlog index a26e174..da1e671 160000 --- a/Specter/vendor/spdlog +++ b/Specter/vendor/spdlog @@ -1 +1 @@ -Subproject commit a26e174b367a60a51f0be83a81d6d066330cdd8f +Subproject commit da1e671d4285fce4b2b1603be90afc652c4f4b65 diff --git a/Specter/vendor/yaml-cpp b/Specter/vendor/yaml-cpp index c73ee34..0e6e28d 160000 --- a/Specter/vendor/yaml-cpp +++ b/Specter/vendor/yaml-cpp @@ -1 +1 @@ -Subproject commit c73ee34704c512ebe915b283645aefa9f424a22f +Subproject commit 0e6e28d1a38224fc8172fae0109ea7f673c096db