From f1a9ec7355d08529deaffcb3ad60a6552b01cf23 Mon Sep 17 00:00:00 2001 From: chatlanin Date: Wed, 19 Feb 2025 23:07:15 +0300 Subject: [PATCH] fix ve headers --- bin/main.cpp | 3 +++ src/VE.hpp | 21 +++++++++------------ src/gui/gui.cpp | 3 --- src/utils/define.hpp | 1 - 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/bin/main.cpp b/bin/main.cpp index f76ac75..1c178c1 100755 --- a/bin/main.cpp +++ b/bin/main.cpp @@ -21,6 +21,9 @@ namespace sandbox namespace VE { + // HERE + // перенести в VE.hpp + // и сделать варитивными параметрами !!! inline application& create() { static sandbox::test_app app{ "vertex_engine_sandbox" }; diff --git a/src/VE.hpp b/src/VE.hpp index 0d502b8..539f11a 100755 --- a/src/VE.hpp +++ b/src/VE.hpp @@ -1,14 +1,11 @@ #pragma once -#include "utils/utils.hpp" - -#include "application/application.hpp" -#include "event/event.hpp" -#include "layer/layer.hpp" -#include "glfw/glfw.hpp" -#include "gui/gui.hpp" - -#include "gui/style/icons.hpp" -#include "gui/style/fonts.hpp" - -#include "opengl/opengl.hpp" +#include "utils/utils.hpp" // IWYU pragma: keep +#include "application/application.hpp" // IWYU pragma: keep +#include "event/event.hpp" // IWYU pragma: keep +#include "layer/layer.hpp" // IWYU pragma: keep +#include "glfw/glfw.hpp" // IWYU pragma: keep +#include "gui/gui.hpp" // IWYU pragma: keep +#include "gui/style/icons.hpp" // IWYU pragma: keep +#include "gui/style/fonts.hpp" // IWYU pragma: keep +#include "opengl/opengl.hpp" // IWYU pragma: keep diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index bbd54fb..fa32b27 100755 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -43,9 +43,6 @@ namespace VE void gui::end_frame() { - // ImGuiIO& io = ImGui::GetIO(); - // io.DisplaySize = ImVec2((float)m_glfw->width(), (float)m_glfw->height()); - ImGui::Render(); ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData()); } diff --git a/src/utils/define.hpp b/src/utils/define.hpp index d56e099..7910a90 100755 --- a/src/utils/define.hpp +++ b/src/utils/define.hpp @@ -16,4 +16,3 @@ #define VE_PUSH_FONT(def_font, def_size)\ ImGui::PushFont(VE::style::fonts::get_font(VE::style::fonts::font_type::def_font, def_size)) #define VE_POP_FONT() ImGui::PopFont() -