EDIT: folder structure refactoring (src/core)

src/scene/camera.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <core/vk_types.h>
+#include <core/types.h>
 #include <SDL_events.h>
 
 #include "glm/vec3.hpp"

src/scene/mesh_bvh.h

@@ -8,7 +8,7 @@
 #include <glm/mat4x4.hpp>
 #include <glm/vec3.hpp>
 
-#include <core/vk_types.h>
+#include <core/types.h>
 #include <bvh/BVH.h>
 
 struct MeshAsset;

src/scene/tangent_space.h

@@ -2,7 +2,7 @@
 
 #include <vector>
 #include <cstddef>
-#include <core/vk_types.h>
+#include <core/types.h>
 
 namespace geom {
 

src/scene/vk_loader.cpp

@@ -3,12 +3,12 @@
 #include <algorithm>
 #include <cmath>
 #include "vk_loader.h"
-#include "core/texture_cache.h"
+#include "core/assets/texture_cache.h"
 
-#include "core/vk_engine.h"
+#include "core/engine.h"
 #include "render/materials.h"
-#include "core/vk_initializers.h"
-#include "core/vk_types.h"
+#include "core/util/initializers.h"
+#include "core/types.h"
 #include "core/config.h"
 #include <glm/gtx/quaternion.hpp>
 

src/scene/vk_loader.h

@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <core/vk_types.h>
+#include <core/types.h>
 
-#include "core/vk_descriptors.h"
+#include "core/descriptor/descriptors.h"
 #include <unordered_map>
 #include <filesystem>
 

src/scene/vk_scene.cpp

@@ -4,8 +4,8 @@
 #include <unordered_set>
 #include <chrono>
 
-#include "vk_swapchain.h"
-#include "core/engine_context.h"
+#include "core/device/swapchain.h"
+#include "core/context.h"
 #include "core/config.h"
 #include "glm/gtx/transform.hpp"
 #include <glm/gtc/matrix_transform.hpp>
@@ -15,7 +15,7 @@
 #include <limits>
 #include <cmath>
 
-#include "frame_resources.h"
+#include "core/frame/resources.h"
 #include "core/config.h"
 #include <fmt/core.h>
 

src/scene/vk_scene.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <core/vk_types.h>
+#include <core/types.h>
 #include <scene/camera.h>
 #include <unordered_map>
 #include <memory>

src/scene/vk_scene_picking.cpp

@@ -1,7 +1,7 @@
 #include "vk_scene.h"
 
-#include "vk_swapchain.h"
-#include "core/engine_context.h"
+#include "core/device/swapchain.h"
+#include "core/context.h"
 #include "mesh_bvh.h"
 
 #include "glm/gtx/transform.hpp"