diff --git a/package.json b/package.json index 1c3db77..4e8f8b2 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,10 @@ "author": "anulax1225", "name": "glad" }, + { + "author": "anulax1225", + "name": "imgui-docking" + }, { "author": "anulax1225", "name": "imgui" diff --git a/premake5.lua b/premake5.lua index 9f201db..d4b7d58 100644 --- a/premake5.lua +++ b/premake5.lua @@ -40,7 +40,7 @@ project "bakara" "bakatools", "GLFW", "GLAD", - "ImGui" + "ImGuiDocking" } filter "configurations:Debug" diff --git a/src/bakara.h b/src/bakara.h index d408bd1..97064f0 100644 --- a/src/bakara.h +++ b/src/bakara.h @@ -14,7 +14,7 @@ Plaform namespace doc */ namespace Bk::Plaform {} -#include +#include #include #include diff --git a/src/bakara/events/mouse_event.h b/src/bakara/events/mouse_event.h index 40746f5..6733a28 100644 --- a/src/bakara/events/mouse_event.h +++ b/src/bakara/events/mouse_event.h @@ -1,7 +1,7 @@ #pragma once #include "event.h" -#include +#include #include namespace Bk diff --git a/src/bakara/imgui/imgui_layer.cpp b/src/bakara/imgui/imgui_layer.cpp index 5b43df4..36b36f6 100644 --- a/src/bakara/imgui/imgui_layer.cpp +++ b/src/bakara/imgui/imgui_layer.cpp @@ -22,8 +22,8 @@ namespace Bk { io.IniFilename = NULL; io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard; - io.ConfigFlags |= ImGuiConfigFlags_DockingEnable; // Enable Docking - io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable; // Enable Multi-Viewport / Platform Windows + //io.ConfigFlags |= ImGuiConfigFlags_DockingEnable; // Enable Docking + //io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable; // Enable Multi-Viewport / Platform Windows //io.ConfigFlags |= ImGuiConfigFlags_ViewportsNoTaskBarIcons; io.ConfigViewportsNoAutoMerge = true; @@ -44,7 +44,7 @@ namespace Bk { // Setup Platform/Renderer bindings ImGui_ImplGlfw_InitForOpenGL(window, true); - ImGui_ImplOpenGL3_Init("#version 410"); + ImGui_ImplOpenGL3_Init("#version 420"); } void ImguiLayer::on_detach() diff --git a/src/bakara/math/type.h b/src/bakara/math/types.h similarity index 87% rename from src/bakara/math/type.h rename to src/bakara/math/types.h index a78b8fa..1bc6c80 100644 --- a/src/bakara/math/type.h +++ b/src/bakara/math/types.h @@ -10,10 +10,6 @@ As long as it's implemented here. namespace Bk { - /*! \typedef Bk::uint - Simplefied name for unsigned int - */ - using uint = unsigned int; /*! \typedef Bk::Vec2 Wrapper around glm::vec2 */ diff --git a/src/bakarapch.h b/src/bakarapch.h index 050f41a..f941037 100644 --- a/src/bakarapch.h +++ b/src/bakarapch.h @@ -17,4 +17,4 @@ Precompiled headers communly used in bakara. #include #include -#include \ No newline at end of file +#include \ No newline at end of file