diff --git a/src/VE.hpp b/src/VE.hpp index 62450cd..c642983 100755 --- a/src/VE.hpp +++ b/src/VE.hpp @@ -1,17 +1,15 @@ #pragma once -#include "event/event.hpp" // IWYU pragma: keep -#include "event/connector.hpp" // IWYU pragma: keep -#include "event/event_manager.hpp" // IWYU pragma: keep -#include "event/type.hpp" // IWYU pragma: keep - -#include "gui/gui.hpp" // IWYU pragma: keep -#include "gui/flags.hpp" // IWYU pragma: keep -#include "gui/style/icons.hpp" // IWYU pragma: keep -#include "gui/style/fonts.hpp" // IWYU pragma: keep - -#include "utils/utils.hpp" // IWYU pragma: keep -#include "application/application.hpp" // IWYU pragma: keep -#include "layer/layer.hpp" // IWYU pragma: keep -#include "glfw/glfw.hpp" // IWYU pragma: keep -#include "opengl/opengl.hpp" // IWYU pragma: keep +#include "vertex_engine/event/event.hpp" // IWYU pragma: keep +#include "vertex_engine/event/connector.hpp" // IWYU pragma: keep +#include "vertex_engine/event/event_manager.hpp" // IWYU pragma: keep +#include "vertex_engine/event/type.hpp" // IWYU pragma: keep +#include "vertex_engine/gui/gui.hpp" // IWYU pragma: keep +#include "vertex_engine/gui/flags.hpp" // IWYU pragma: keep +#include "vertex_engine/gui/style/icons.hpp" // IWYU pragma: keep +#include "vertex_engine/gui/style/fonts.hpp" // IWYU pragma: keep +#include "vertex_engine/utils/utils.hpp" // IWYU pragma: keep +#include "vertex_engine/layer/layer.hpp" // IWYU pragma: keep +#include "vertex_engine/glfw/glfw.hpp" // IWYU pragma: keep +#include "vertex_engine/opengl/opengl.hpp" // IWYU pragma: keep +#include "vertex_engine/application/application.hpp" // IWYU pragma: keep diff --git a/src/meson.build b/src/meson.build index 024e089..a4770df 100755 --- a/src/meson.build +++ b/src/meson.build @@ -1,43 +1,43 @@ inc += include_directories('.') headers = [ - 'application/application.hpp', - 'event/event.hpp', + 'vertex_engine/application/application.hpp', + 'vertex_engine/event/event.hpp', - 'glfw/context/context.hpp', - 'glfw/glfw.hpp', + 'vertex_engine/glfw/context/context.hpp', + 'vertex_engine/glfw/glfw.hpp', - 'gui/style/fonts.hpp', - 'gui/style/icons.hpp', - 'gui/style/style.hpp', - 'gui/flags.hpp', + 'vertex_engine/gui/style/fonts.hpp', + 'vertex_engine/gui/style/icons.hpp', + 'vertex_engine/gui/style/style.hpp', + 'vertex_engine/gui/flags.hpp', - 'layer/layer.hpp', + 'vertex_engine/layer/layer.hpp', - 'utils/define.hpp', - 'utils/include.hpp', - 'utils/keycode.hpp', - # 'utils/time.hpp', - 'utils/using.hpp', - 'utils/var.hpp', - 'utils/utils.hpp', + 'vertex_engine/utils/define.hpp', + 'vertex_engine/utils/include.hpp', + 'vertex_engine/utils/keycode.hpp', + # 'vertex_engine/utils/time.hpp', + 'vertex_engine/utils/using.hpp', + 'vertex_engine/utils/var.hpp', + 'vertex_engine/utils/utils.hpp', - 'opengl/buffer/buffer.hpp', - 'opengl/shader_program/shader_program.hpp', - 'opengl/opengl.hpp', + 'vertex_engine/opengl/buffer/buffer.hpp', + 'vertex_engine/opengl/shader_program/shader_program.hpp', + 'vertex_engine/opengl/opengl.hpp', 'VE.hpp' ] sources = [ - 'application/application.cpp', + 'vertex_engine/application/application.cpp', - 'glfw/context/context.cpp', - 'glfw/glfw.cpp', - 'gui/gui.cpp', + 'vertex_engine/glfw/context/context.cpp', + 'vertex_engine/glfw/glfw.cpp', + 'vertex_engine/gui/gui.cpp', - 'opengl/buffer/buffer.cpp', - 'opengl/shader_program/shader_program.cpp' + 'vertex_engine/opengl/buffer/buffer.cpp', + 'vertex_engine/opengl/shader_program/shader_program.cpp' ] lib = library( diff --git a/src/application/application.cpp b/src/vertex_engine/application/application.cpp similarity index 100% rename from src/application/application.cpp rename to src/vertex_engine/application/application.cpp diff --git a/src/application/application.hpp b/src/vertex_engine/application/application.hpp similarity index 87% rename from src/application/application.hpp rename to src/vertex_engine/application/application.hpp index b45e347..6ea9370 100755 --- a/src/application/application.hpp +++ b/src/vertex_engine/application/application.hpp @@ -1,8 +1,8 @@ #pragma once -#include "glfw/glfw.hpp" -#include "gui/gui.hpp" -#include "layer/layer.hpp" +#include "vertex_engine/glfw/glfw.hpp" +#include "vertex_engine/gui/gui.hpp" +#include "vertex_engine/layer/layer.hpp" namespace VE { diff --git a/src/event/connector.hpp b/src/vertex_engine/event/connector.hpp similarity index 100% rename from src/event/connector.hpp rename to src/vertex_engine/event/connector.hpp diff --git a/src/event/event.hpp b/src/vertex_engine/event/event.hpp similarity index 100% rename from src/event/event.hpp rename to src/vertex_engine/event/event.hpp diff --git a/src/event/event_manager.hpp b/src/vertex_engine/event/event_manager.hpp similarity index 98% rename from src/event/event_manager.hpp rename to src/vertex_engine/event/event_manager.hpp index ed09216..5f4c0c5 100755 --- a/src/event/event_manager.hpp +++ b/src/vertex_engine/event/event_manager.hpp @@ -3,9 +3,8 @@ #include #include #include - #include "event.hpp" -#include "utils/using.hpp" +#include "vertex_engine/utils/using.hpp" namespace VE { diff --git a/src/event/type.hpp b/src/vertex_engine/event/type.hpp similarity index 100% rename from src/event/type.hpp rename to src/vertex_engine/event/type.hpp diff --git a/src/glfw/context/context.cpp b/src/vertex_engine/glfw/context/context.cpp similarity index 100% rename from src/glfw/context/context.cpp rename to src/vertex_engine/glfw/context/context.cpp diff --git a/src/glfw/context/context.hpp b/src/vertex_engine/glfw/context/context.hpp similarity index 75% rename from src/glfw/context/context.hpp rename to src/vertex_engine/glfw/context/context.hpp index 0281434..ddaf620 100755 --- a/src/glfw/context/context.hpp +++ b/src/vertex_engine/glfw/context/context.hpp @@ -1,6 +1,6 @@ #pragma once -#include "utils/utils.hpp" // IWYU pragma: keep +#include "vertex_engine/utils/utils.hpp" // IWYU pragma: keep namespace VE { diff --git a/src/glfw/glfw.cpp b/src/vertex_engine/glfw/glfw.cpp similarity index 98% rename from src/glfw/glfw.cpp rename to src/vertex_engine/glfw/glfw.cpp index 8972018..187b37e 100755 --- a/src/glfw/glfw.cpp +++ b/src/vertex_engine/glfw/glfw.cpp @@ -1,7 +1,7 @@ #include "glfw.hpp" -#include "event/type.hpp" -#include "event/connector.hpp" +#include "vertex_engine/event/type.hpp" +#include "vertex_engine/event/connector.hpp" namespace VE { diff --git a/src/glfw/glfw.hpp b/src/vertex_engine/glfw/glfw.hpp similarity index 94% rename from src/glfw/glfw.hpp rename to src/vertex_engine/glfw/glfw.hpp index e2b71d8..abfc9b2 100755 --- a/src/glfw/glfw.hpp +++ b/src/vertex_engine/glfw/glfw.hpp @@ -1,6 +1,6 @@ #pragma once -#include "utils/utils.hpp" // IWYU pragma: keep +#include "vertex_engine/utils/utils.hpp" // IWYU pragma: keep #include "context/context.hpp" namespace VE diff --git a/src/gui/flags.hpp b/src/vertex_engine/gui/flags.hpp similarity index 94% rename from src/gui/flags.hpp rename to src/vertex_engine/gui/flags.hpp index 00f9805..b314700 100644 --- a/src/gui/flags.hpp +++ b/src/vertex_engine/gui/flags.hpp @@ -1,6 +1,6 @@ #pragma once -#include "utils/utils.hpp" // IWYU pragma: keep +#include "vertex_engine/utils/utils.hpp" // IWYU pragma: keep namespace VE { diff --git a/src/gui/gui.cpp b/src/vertex_engine/gui/gui.cpp similarity index 100% rename from src/gui/gui.cpp rename to src/vertex_engine/gui/gui.cpp diff --git a/src/gui/gui.hpp b/src/vertex_engine/gui/gui.hpp similarity index 69% rename from src/gui/gui.hpp rename to src/vertex_engine/gui/gui.hpp index 9d684eb..0aaf3ce 100755 --- a/src/gui/gui.hpp +++ b/src/vertex_engine/gui/gui.hpp @@ -1,7 +1,7 @@ #pragma once -#include "utils/utils.hpp" // IWYU pragma: keep -#include "glfw/glfw.hpp" +#include "vertex_engine/utils/utils.hpp" // IWYU pragma: keep +#include "vertex_engine/glfw/glfw.hpp" namespace VE { diff --git a/src/gui/style/fonts.hpp b/src/vertex_engine/gui/style/fonts.hpp similarity index 98% rename from src/gui/style/fonts.hpp rename to src/vertex_engine/gui/style/fonts.hpp index 2771d81..3b59f80 100755 --- a/src/gui/style/fonts.hpp +++ b/src/vertex_engine/gui/style/fonts.hpp @@ -8,7 +8,7 @@ #include "icons.hpp" -#include "utils/utils.hpp" // IWYU pragma: keep +#include "vertex_engine/utils/utils.hpp" // IWYU pragma: keep namespace VE::style::fonts { diff --git a/src/gui/style/fonts/FontAwesome/forkawesome-webfont.ttf b/src/vertex_engine/gui/style/fonts/FontAwesome/forkawesome-webfont.ttf similarity index 100% rename from src/gui/style/fonts/FontAwesome/forkawesome-webfont.ttf rename to src/vertex_engine/gui/style/fonts/FontAwesome/forkawesome-webfont.ttf diff --git a/src/gui/style/fonts/Montserrat/Montserrat-Black.ttf b/src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-Black.ttf similarity index 100% rename from src/gui/style/fonts/Montserrat/Montserrat-Black.ttf rename to src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-Black.ttf diff --git a/src/gui/style/fonts/Montserrat/Montserrat-BlackItalic.ttf b/src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-BlackItalic.ttf similarity index 100% rename from src/gui/style/fonts/Montserrat/Montserrat-BlackItalic.ttf rename to src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-BlackItalic.ttf diff --git a/src/gui/style/fonts/Montserrat/Montserrat-Bold.ttf b/src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-Bold.ttf similarity index 100% rename from src/gui/style/fonts/Montserrat/Montserrat-Bold.ttf rename to src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-Bold.ttf diff --git a/src/gui/style/fonts/Montserrat/Montserrat-BoldItalic.ttf b/src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-BoldItalic.ttf similarity index 100% rename from src/gui/style/fonts/Montserrat/Montserrat-BoldItalic.ttf rename to src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-BoldItalic.ttf diff --git a/src/gui/style/fonts/Montserrat/Montserrat-ExtraBold.ttf b/src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-ExtraBold.ttf similarity index 100% rename from src/gui/style/fonts/Montserrat/Montserrat-ExtraBold.ttf rename to src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-ExtraBold.ttf diff --git a/src/gui/style/fonts/Montserrat/Montserrat-ExtraBoldItalic.ttf b/src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-ExtraBoldItalic.ttf similarity index 100% rename from src/gui/style/fonts/Montserrat/Montserrat-ExtraBoldItalic.ttf rename to src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-ExtraBoldItalic.ttf diff --git a/src/gui/style/fonts/Montserrat/Montserrat-ExtraLight.ttf b/src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-ExtraLight.ttf similarity index 100% rename from src/gui/style/fonts/Montserrat/Montserrat-ExtraLight.ttf rename to src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-ExtraLight.ttf diff --git a/src/gui/style/fonts/Montserrat/Montserrat-ExtraLightItalic.ttf b/src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-ExtraLightItalic.ttf similarity index 100% rename from src/gui/style/fonts/Montserrat/Montserrat-ExtraLightItalic.ttf rename to src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-ExtraLightItalic.ttf diff --git a/src/gui/style/fonts/Montserrat/Montserrat-Italic.ttf b/src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-Italic.ttf similarity index 100% rename from src/gui/style/fonts/Montserrat/Montserrat-Italic.ttf rename to src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-Italic.ttf diff --git a/src/gui/style/fonts/Montserrat/Montserrat-Light.ttf b/src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-Light.ttf similarity index 100% rename from src/gui/style/fonts/Montserrat/Montserrat-Light.ttf rename to src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-Light.ttf diff --git a/src/gui/style/fonts/Montserrat/Montserrat-LightItalic.ttf b/src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-LightItalic.ttf similarity index 100% rename from src/gui/style/fonts/Montserrat/Montserrat-LightItalic.ttf rename to src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-LightItalic.ttf diff --git a/src/gui/style/fonts/Montserrat/Montserrat-Medium.ttf b/src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-Medium.ttf similarity index 100% rename from src/gui/style/fonts/Montserrat/Montserrat-Medium.ttf rename to src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-Medium.ttf diff --git a/src/gui/style/fonts/Montserrat/Montserrat-MediumItalic.ttf b/src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-MediumItalic.ttf similarity index 100% rename from src/gui/style/fonts/Montserrat/Montserrat-MediumItalic.ttf rename to src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-MediumItalic.ttf diff --git a/src/gui/style/fonts/Montserrat/Montserrat-Regular.ttf b/src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-Regular.ttf similarity index 100% rename from src/gui/style/fonts/Montserrat/Montserrat-Regular.ttf rename to src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-Regular.ttf diff --git a/src/gui/style/fonts/Montserrat/Montserrat-SemiBold.ttf b/src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-SemiBold.ttf similarity index 100% rename from src/gui/style/fonts/Montserrat/Montserrat-SemiBold.ttf rename to src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-SemiBold.ttf diff --git a/src/gui/style/fonts/Montserrat/Montserrat-SemiBoldItalic.ttf b/src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-SemiBoldItalic.ttf similarity index 100% rename from src/gui/style/fonts/Montserrat/Montserrat-SemiBoldItalic.ttf rename to src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-SemiBoldItalic.ttf diff --git a/src/gui/style/fonts/Montserrat/Montserrat-Thin.ttf b/src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-Thin.ttf similarity index 100% rename from src/gui/style/fonts/Montserrat/Montserrat-Thin.ttf rename to src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-Thin.ttf diff --git a/src/gui/style/fonts/Montserrat/Montserrat-ThinItalic.ttf b/src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-ThinItalic.ttf similarity index 100% rename from src/gui/style/fonts/Montserrat/Montserrat-ThinItalic.ttf rename to src/vertex_engine/gui/style/fonts/Montserrat/Montserrat-ThinItalic.ttf diff --git a/src/gui/style/icons.hpp b/src/vertex_engine/gui/style/icons.hpp similarity index 100% rename from src/gui/style/icons.hpp rename to src/vertex_engine/gui/style/icons.hpp diff --git a/src/gui/style/style.hpp b/src/vertex_engine/gui/style/style.hpp similarity index 98% rename from src/gui/style/style.hpp rename to src/vertex_engine/gui/style/style.hpp index d13a162..7db6d86 100755 --- a/src/gui/style/style.hpp +++ b/src/vertex_engine/gui/style/style.hpp @@ -1,7 +1,6 @@ #pragma once -#include "imgui.h" - +#include "vertex_engine/utils/utils.hpp" // IWYU pragma: keep #include "icons.hpp" // IWYU pragma: keep #include "fonts.hpp" diff --git a/src/layer/layer.hpp b/src/vertex_engine/layer/layer.hpp similarity index 84% rename from src/layer/layer.hpp rename to src/vertex_engine/layer/layer.hpp index 91a49b9..a308e24 100755 --- a/src/layer/layer.hpp +++ b/src/vertex_engine/layer/layer.hpp @@ -1,7 +1,7 @@ #pragma once -#include "event/event.hpp" -#include "utils/using.hpp" +#include "vertex_engine/event/event.hpp" +#include "vertex_engine/utils/using.hpp" namespace VE { diff --git a/src/opengl/buffer/buffer.cpp b/src/vertex_engine/opengl/buffer/buffer.cpp similarity index 100% rename from src/opengl/buffer/buffer.cpp rename to src/vertex_engine/opengl/buffer/buffer.cpp diff --git a/src/opengl/buffer/buffer.hpp b/src/vertex_engine/opengl/buffer/buffer.hpp similarity index 84% rename from src/opengl/buffer/buffer.hpp rename to src/vertex_engine/opengl/buffer/buffer.hpp index 14d3cb0..78bb05a 100644 --- a/src/opengl/buffer/buffer.hpp +++ b/src/vertex_engine/opengl/buffer/buffer.hpp @@ -1,6 +1,6 @@ #pragma once -#include "utils/utils.hpp" // IWYU pragma: keep +#include "vertex_engine/utils/utils.hpp" // IWYU pragma: keep namespace VE { diff --git a/src/opengl/opengl.hpp b/src/vertex_engine/opengl/opengl.hpp similarity index 100% rename from src/opengl/opengl.hpp rename to src/vertex_engine/opengl/opengl.hpp diff --git a/src/opengl/shader_program/shader_program.cpp b/src/vertex_engine/opengl/shader_program/shader_program.cpp similarity index 100% rename from src/opengl/shader_program/shader_program.cpp rename to src/vertex_engine/opengl/shader_program/shader_program.cpp diff --git a/src/opengl/shader_program/shader_program.hpp b/src/vertex_engine/opengl/shader_program/shader_program.hpp similarity index 96% rename from src/opengl/shader_program/shader_program.hpp rename to src/vertex_engine/opengl/shader_program/shader_program.hpp index cc9aa66..e7262b8 100644 --- a/src/opengl/shader_program/shader_program.hpp +++ b/src/vertex_engine/opengl/shader_program/shader_program.hpp @@ -1,8 +1,7 @@ #pragma once #include - -#include "utils/utils.hpp" // IWYU pragma: keep +#include "vertex_engine/utils/utils.hpp" // IWYU pragma: keep namespace VE { diff --git a/src/utils/define.hpp b/src/vertex_engine/utils/define.hpp similarity index 100% rename from src/utils/define.hpp rename to src/vertex_engine/utils/define.hpp diff --git a/src/utils/func.hpp b/src/vertex_engine/utils/func.hpp similarity index 99% rename from src/utils/func.hpp rename to src/vertex_engine/utils/func.hpp index ae6300e..dca8025 100644 --- a/src/utils/func.hpp +++ b/src/vertex_engine/utils/func.hpp @@ -1,7 +1,6 @@ #pragma once #include - #include namespace VE::func diff --git a/src/utils/include.hpp b/src/vertex_engine/utils/include.hpp similarity index 97% rename from src/utils/include.hpp rename to src/vertex_engine/utils/include.hpp index 7b0b715..657fbc5 100755 --- a/src/utils/include.hpp +++ b/src/vertex_engine/utils/include.hpp @@ -24,20 +24,18 @@ #include #include - #include #include - #include #include #include #include +#include // такой порядок imgui.h #ifndef IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS #endif - #include #include diff --git a/src/utils/keycode.hpp b/src/vertex_engine/utils/keycode.hpp similarity index 100% rename from src/utils/keycode.hpp rename to src/vertex_engine/utils/keycode.hpp diff --git a/src/utils/time.hpp b/src/vertex_engine/utils/time.hpp similarity index 99% rename from src/utils/time.hpp rename to src/vertex_engine/utils/time.hpp index 50246f4..402c30c 100644 --- a/src/utils/time.hpp +++ b/src/vertex_engine/utils/time.hpp @@ -10,9 +10,7 @@ namespace VE { public: timestep(Type data_ = 0.0f) : data { data_ } {} - operator Type() const { return data; } - Type get_seconds() const { return data; } Type get_milliseconds() const { return data * 1000.0f; } diff --git a/src/utils/using.hpp b/src/vertex_engine/utils/using.hpp similarity index 100% rename from src/utils/using.hpp rename to src/vertex_engine/utils/using.hpp diff --git a/src/utils/utils.hpp b/src/vertex_engine/utils/utils.hpp similarity index 100% rename from src/utils/utils.hpp rename to src/vertex_engine/utils/utils.hpp diff --git a/src/utils/var.hpp b/src/vertex_engine/utils/var.hpp similarity index 75% rename from src/utils/var.hpp rename to src/vertex_engine/utils/var.hpp index fe7e376..707f3c9 100644 --- a/src/utils/var.hpp +++ b/src/vertex_engine/utils/var.hpp @@ -1,11 +1,11 @@ #pragma once -#include "include.hpp" // IWYU pragma: keep +#include namespace VE::var { // HERE // эту порнографию с путями нужно решить - inline const std::string FONT_PATH = "/mnt/raid/projects/vertex_engine/vertex_engine/src/gui/style/fonts"; + inline const std::string FONT_PATH = "/mnt/raid/projects/vertex_engine/vertex_engine/src/vertex_engine/gui/style/fonts"; inline const std::string ICONS_PATH = FONT_PATH + "/FontAwesome/forkawesome-webfont.ttf"; }