fix path

src/VE.hpp

@@ -1,17 +1,15 @@
 #pragma once
 
-#include "event/event.hpp" // IWYU pragma: keep
+#include "vertex_engine/event/event.hpp" // IWYU pragma: keep
-#include "event/connector.hpp" // IWYU pragma: keep
+#include "vertex_engine/event/connector.hpp" // IWYU pragma: keep
-#include "event/event_manager.hpp" // IWYU pragma: keep
+#include "vertex_engine/event/event_manager.hpp" // IWYU pragma: keep
-#include "event/type.hpp" // IWYU pragma: keep
+#include "vertex_engine/event/type.hpp" // IWYU pragma: keep
-
+#include "vertex_engine/gui/gui.hpp" // IWYU pragma: keep
-#include "gui/gui.hpp" // IWYU pragma: keep
+#include "vertex_engine/gui/flags.hpp" // IWYU pragma: keep
-#include "gui/flags.hpp" // IWYU pragma: keep
+#include "vertex_engine/gui/style/icons.hpp" // IWYU pragma: keep
-#include "gui/style/icons.hpp" // IWYU pragma: keep
+#include "vertex_engine/gui/style/fonts.hpp" // IWYU pragma: keep
-#include "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 "utils/utils.hpp" // IWYU pragma: keep
+#include "vertex_engine/glfw/glfw.hpp" // IWYU pragma: keep
-#include "application/application.hpp" // IWYU pragma: keep
+#include "vertex_engine/opengl/opengl.hpp" // IWYU pragma: keep
-#include "layer/layer.hpp" // IWYU pragma: keep
+#include "vertex_engine/application/application.hpp" // IWYU pragma: keep
-#include "glfw/glfw.hpp" // IWYU pragma: keep
-#include "opengl/opengl.hpp" // IWYU pragma: keep

src/meson.build

@@ -1,43 +1,43 @@
 inc += include_directories('.')
 
 headers = [ 
-  'application/application.hpp',
+  'vertex_engine/application/application.hpp',
-  'event/event.hpp',
+  'vertex_engine/event/event.hpp',
 
-  'glfw/context/context.hpp',
+  'vertex_engine/glfw/context/context.hpp',
-  'glfw/glfw.hpp',
+  'vertex_engine/glfw/glfw.hpp',
 
-  'gui/style/fonts.hpp',
+  'vertex_engine/gui/style/fonts.hpp',
-  'gui/style/icons.hpp',
+  'vertex_engine/gui/style/icons.hpp',
-  'gui/style/style.hpp',
+  'vertex_engine/gui/style/style.hpp',
-  'gui/flags.hpp',
+  'vertex_engine/gui/flags.hpp',
 
-  'layer/layer.hpp',
+  'vertex_engine/layer/layer.hpp',
 
-  'utils/define.hpp',
+  'vertex_engine/utils/define.hpp',
-  'utils/include.hpp',
+  'vertex_engine/utils/include.hpp',
-  'utils/keycode.hpp',
+  'vertex_engine/utils/keycode.hpp',
-  # 'utils/time.hpp',
+  # 'vertex_engine/utils/time.hpp',
-  'utils/using.hpp',
+  'vertex_engine/utils/using.hpp',
-  'utils/var.hpp',
+  'vertex_engine/utils/var.hpp',
-  'utils/utils.hpp',
+  'vertex_engine/utils/utils.hpp',
 
-  'opengl/buffer/buffer.hpp',
+  'vertex_engine/opengl/buffer/buffer.hpp',
-  'opengl/shader_program/shader_program.hpp',
+  'vertex_engine/opengl/shader_program/shader_program.hpp',
-  'opengl/opengl.hpp',
+  'vertex_engine/opengl/opengl.hpp',
 
   'VE.hpp'
 ]
 
 sources = [ 
-  'application/application.cpp',
+  'vertex_engine/application/application.cpp',
 
-  'glfw/context/context.cpp',
+  'vertex_engine/glfw/context/context.cpp',
-  'glfw/glfw.cpp',
+  'vertex_engine/glfw/glfw.cpp',
-  'gui/gui.cpp',
+  'vertex_engine/gui/gui.cpp',
 
-  'opengl/buffer/buffer.cpp',
+  'vertex_engine/opengl/buffer/buffer.cpp',
-  'opengl/shader_program/shader_program.cpp'
+  'vertex_engine/opengl/shader_program/shader_program.cpp'
 ]
 
 lib = library(

src/vertex_engine/application/application.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "glfw/glfw.hpp"
+#include "vertex_engine/glfw/glfw.hpp"
-#include "gui/gui.hpp"
+#include "vertex_engine/gui/gui.hpp"
-#include "layer/layer.hpp"
+#include "vertex_engine/layer/layer.hpp"
 
 namespace VE
 {

src/vertex_engine/event/event_manager.hpp

@@ -3,9 +3,8 @@
 #include <hack/patterns/singleton.hpp>
 #include <hack/logger/logger.hpp>
 #include <hack/security/uuid.hpp>
-
 #include "event.hpp"
-#include "utils/using.hpp"
+#include "vertex_engine/utils/using.hpp"
 
 namespace VE
 {

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
 {

src/vertex_engine/glfw/glfw.cpp

@@ -1,7 +1,7 @@
 #include "glfw.hpp"
 
-#include "event/type.hpp"
+#include "vertex_engine/event/type.hpp"
-#include "event/connector.hpp"
+#include "vertex_engine/event/connector.hpp"
 
 namespace VE
 {

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

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
 {

src/vertex_engine/gui/gui.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "utils/utils.hpp" // IWYU pragma: keep
+#include "vertex_engine/utils/utils.hpp" // IWYU pragma: keep
-#include "glfw/glfw.hpp"
+#include "vertex_engine/glfw/glfw.hpp"
 
 namespace VE
 {

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
 {

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"
 

src/vertex_engine/layer/layer.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "event/event.hpp"
+#include "vertex_engine/event/event.hpp"
-#include "utils/using.hpp"
+#include "vertex_engine/utils/using.hpp"
 
 namespace VE 
 {

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
 {

src/vertex_engine/opengl/shader_program/shader_program.hpp

@@ -1,8 +1,7 @@
 #pragma once
 
 #include <glm/gtc/type_ptr.hpp>
-
+#include "vertex_engine/utils/utils.hpp" // IWYU pragma: keep
-#include "utils/utils.hpp" // IWYU pragma: keep
 
 namespace VE
 {

src/vertex_engine/utils/func.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <string>
-
 #include <imgui.h> 
                    
 namespace VE::func

src/vertex_engine/utils/include.hpp

@@ -24,20 +24,18 @@
 
 #include <glad.h> 
 #include <GLFW/glfw3.h> 
-
 #include <hack/logger/logger.hpp>
 #include <hack/patterns/singleton.hpp> 
-
 #include <imgui.h> 
 #include <imgui_internal.h>
 #include <imgui_impl_glfw.h> 
 #include <imgui_impl_opengl3.h>
+#include <misc/cpp/imgui_stdlib.h>
 
 // такой порядок  imgui.h
 #ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
 #endif
 
-
 #include <glm/glm.hpp>
 #include <glm/gtc/type_ptr.hpp>

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; }
       

src/vertex_engine/utils/var.hpp

@@ -1,11 +1,11 @@
 #pragma once
 
-#include "include.hpp" // IWYU pragma: keep
+#include <string>
 
 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";
 }