More reorganization

Move logging to new folder

src/editor/src/components/ModelComponent.cpp

@@ -5,7 +5,7 @@
 #include "engine/gameobjects/components/ModelComponent.hpp"
 
 #include "engine/gameobjects/components/drawers.hpp"
-#include "engine/model/Model.hpp"
+#include "engine/assets/model/Model.hpp"
 #include "gui/safe_include.hpp"
 
 namespace fgl::engine

src/editor/src/gui/FileBrowser.cpp

@@ -7,10 +7,10 @@
 #include <cmath>
 
 #include "engine/assets/stores.hpp"
+#include "engine/debug/logging/logging.hpp"
 #include "engine/filesystem/scanner/FileScanner.hpp"
 #include "engine/filesystem/types.hpp"
-#include "engine/image/ImageView.hpp"
-#include "engine/logging/logging.hpp"
+#include "engine/assets/image/ImageView.hpp"
 #include "engine/texture/Texture.hpp"
 #include "safe_include.hpp"
 

src/editor/src/gui/core.cpp

@@ -17,7 +17,7 @@
 #include "FileBrowser.hpp"
 #include "engine/debug/DEBUG_NAMES.hpp"
 #include "engine/descriptors/DescriptorPool.hpp"
-#include "engine/model/Model.hpp"
+#include "engine/assets/model/Model.hpp"
 #include "engine/rendering/Renderer.hpp"
 #include "engine/tree/octtree/OctTreeNode.hpp"
 #include "gui_window_names.hpp"

src/editor/src/gui/drawStats.cpp

@@ -2,9 +2,9 @@
 #include <vulkan/vulkan.hpp>
 
 #include "core.hpp"
-#include "engine/buffers/Buffer.hpp"
-#include "engine/literals/size.hpp"
-#include "engine/profiling/counters.hpp"
+#include "engine/memory/buffers/Buffer.hpp"
+#include "engine/math/literals/size.hpp"
+#include "engine/debug/profiling/counters.hpp"
 #include "safe_include.hpp"
 
 namespace fgl::engine::gui

src/editor/src/gui/preview.cpp

@@ -10,8 +10,8 @@
 #include "engine/filesystem/scanner/FileScanner.hpp"
 #include "engine/filesystem/types.hpp"
 #include "engine/gameobjects/components/ModelComponent.hpp"
-#include "engine/model/Model.hpp"
-#include "engine/model/builders/SceneBuilder.hpp"
+#include "engine/assets/model/Model.hpp"
+#include "engine/assets/model/builders/SceneBuilder.hpp"
 #include "engine/rendering/SwapChain.hpp"
 #include "engine/tree/octtree/OctTreeNode.hpp"
 #include "safe_include.hpp"

src/engine/EngineContext.cpp

@@ -16,8 +16,8 @@
 #include "camera/CameraManager.hpp"
 #include "engine/Average.hpp"
 #include "engine/assets/TransferManager.hpp"
-#include "engine/literals/size.hpp"
-#include "model/builders/SceneBuilder.hpp"
+#include "engine/assets/model/builders/SceneBuilder.hpp"
+#include "engine/math/literals/size.hpp"
 
 namespace fgl::engine
 {

src/engine/EngineContext.hpp

@@ -6,7 +6,7 @@
 
 #include "Window.hpp"
 #include "clock.hpp"
-#include "engine/literals/size.hpp"
+#include "engine/math/literals/size.hpp"
 #include "engine/rendering/Renderer.hpp"
 #include "engine/tree/octtree/OctTreeNode.hpp"
 #include "systems/GuiSystem.hpp"

src/engine/assets/TransferData.cpp

@@ -4,11 +4,11 @@
 
 #include "TransferData.hpp"
 
-#include "engine/buffers/exceptions.hpp"
-#include "engine/buffers/vector/HostVector.hpp"
-#include "engine/image/ImageHandle.hpp"
-#include "engine/literals/size.hpp"
-#include "engine/logging/logging.hpp"
+#include "engine/memory/buffers/exceptions.hpp"
+#include "engine/memory/buffers/vector/HostVector.hpp"
+#include "engine/assets/image/ImageHandle.hpp"
+#include "engine/math/literals/size.hpp"
+#include "engine/debug/logging/logging.hpp"
 #include "engine/utils.hpp"
 
 namespace fgl::engine::memory

src/engine/assets/TransferManager.cpp

@@ -4,12 +4,12 @@
 
 #include "TransferManager.hpp"
 
-#include "engine/buffers/Buffer.hpp"
-#include "engine/buffers/BufferSuballocation.hpp"
-#include "engine/buffers/vector/HostVector.hpp"
-#include "engine/image/Image.hpp"
-#include "engine/image/ImageHandle.hpp"
-#include "engine/literals/size.hpp"
+#include "engine/memory/buffers/Buffer.hpp"
+#include "engine/memory/buffers/BufferSuballocation.hpp"
+#include "engine/memory/buffers/vector/HostVector.hpp"
+#include "engine/assets/image/Image.hpp"
+#include "engine/assets/image/ImageHandle.hpp"
+#include "engine/math/literals/size.hpp"
 #include "engine/texture/Texture.hpp"
 
 namespace fgl::engine::memory

src/engine/assets/TransferManager.hpp

@@ -10,7 +10,7 @@
 
 #include "TransferData.hpp"
 #include "engine/FGL_DEFINES.hpp"
-#include "engine/buffers/vector/concepts.hpp"
+#include "engine/memory/buffers/vector/concepts.hpp"
 
 namespace fgl::engine
 {

src/engine/assets/image/Image.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "engine/image/ImageHandle.hpp"
+#include "engine/assets/image/ImageHandle.hpp"
 
 namespace fgl::engine
 {

src/engine/assets/image/ImageHandle.hpp

@@ -8,7 +8,7 @@
 
 #include <memory>
 
-#include "engine/logging/logging.hpp"
+#include "engine/debug/logging/logging.hpp"
 #include "engine/rendering/devices/Device.hpp"
 #include "vma/vma_impl.hpp"
 #include "vulkan/vulkan.hpp"

src/engine/assets/image/Sampler.hpp

@@ -8,7 +8,7 @@
 #include <vulkan/vulkan_raii.hpp>
 
 #include "engine/FGL_DEFINES.hpp"
-#include "engine/logging/logging.hpp"
+#include "engine/debug/logging/logging.hpp"
 
 namespace fgl::engine
 {

src/engine/assets/model/Model.cpp

@@ -9,8 +9,8 @@
 
 #include "builders/ModelBuilder.hpp"
 #include "builders/SceneBuilder.hpp"
-#include "engine/buffers/Buffer.hpp"
-#include "engine/image/ImageView.hpp"
+#include "engine/memory/buffers/Buffer.hpp"
+#include "engine/assets/image/ImageView.hpp"
 
 namespace fgl::engine
 {

src/engine/assets/model/Primitive.hpp

@@ -7,7 +7,7 @@
 #include <cstdint>
 
 #include "ModelVertex.hpp"
-#include "engine/buffers/vector/DeviceVector.hpp"
+#include "engine/memory/buffers/vector/DeviceVector.hpp"
 #include "engine/primitives/CoordinateSpace.hpp"
 #include "engine/primitives/boxes/OrientedBoundingBox.hpp"
 #include "engine/texture/Texture.hpp"

src/engine/assets/model/builders/ModelBuilder.cpp

@@ -4,7 +4,7 @@
 
 #include "ModelBuilder.hpp"
 
-#include "engine/model/Primitive.hpp"
+#include "engine/assets/model/Primitive.hpp"
 
 namespace fgl::engine
 {

src/engine/assets/model/builders/SceneBuilder.cpp

@@ -4,7 +4,7 @@
 
 #include "SceneBuilder.hpp"
 
-#include "engine/model/Model.hpp"
+#include "engine/assets/model/Model.hpp"
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wold-style-cast"
@@ -12,13 +12,12 @@
 #include "objectloaders/tiny_gltf.h"
 #pragma GCC diagnostic pop
 
-#include <engine/logging/logging.hpp>
-
 #include "engine/assets/stores.hpp"
 #include "engine/camera/Camera.hpp"
+#include "engine/debug/logging/logging.hpp"
 #include "engine/descriptors/DescriptorSet.hpp"
 #include "engine/gameobjects/GameObject.hpp"
-#include "engine/image/ImageView.hpp"
+#include "engine/assets/image/ImageView.hpp"
 
 namespace fgl::engine
 {

src/engine/assets/model/builders/loadObj.cpp

@@ -12,8 +12,8 @@
 #include <unordered_map>
 
 #include "ModelBuilder.hpp"
-#include "engine/model/ModelVertex.hpp"
-#include "engine/model/Primitive.hpp"
+#include "engine/assets/model/ModelVertex.hpp"
+#include "engine/assets/model/Primitive.hpp"
 #include "engine/primitives/boxes/OrientedBoundingBox.hpp"
 
 namespace fgl::engine

src/engine/assets/model/prebuilt/terrainModel.cpp

@@ -4,7 +4,7 @@
 
 #include "terrainModel.hpp"
 
-#include "engine/model/Model.hpp"
+#include "engine/assets/model/Model.hpp"
 
 namespace fgl::engine
 {

src/engine/camera/Camera.hpp

@@ -12,8 +12,8 @@
 #include <glm/gtx/string_cast.hpp>
 #pragma GCC diagnostic pop
 
-#include "engine/buffers/HostSingleT.hpp"
-#include "engine/buffers/UniqueFrameSuballocation.hpp"
+#include "engine/memory/buffers/HostSingleT.hpp"
+#include "engine/memory/buffers/UniqueFrameSuballocation.hpp"
 #include "engine/descriptors/DescriptorSet.hpp"
 #include "engine/primitives/Frustum.hpp"
 #include "engine/primitives/Rotation.hpp"

src/engine/camera/CameraManager.cpp

@@ -6,7 +6,7 @@
 
 #include "Camera.hpp"
 #include "engine/debug/DEBUG_NAMES.hpp"
-#include "engine/literals/size.hpp"
+#include "engine/math/literals/size.hpp"
 
 namespace fgl::engine
 {

src/engine/camera/CameraManager.hpp

@@ -6,7 +6,7 @@
 #include <vector>
 
 #include "Camera.hpp"
-#include "engine/buffers/Buffer.hpp"
+#include "engine/memory/buffers/Buffer.hpp"
 
 namespace fgl::engine
 {

src/engine/camera/CameraSwapchain.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "../rendering/pipelines/Attachment.hpp"
+#include "engine/rendering/pipelines/Attachment.hpp"
 #include "engine/descriptors/DescriptorSet.hpp"
 #include "engine/rendering/SwapChain.hpp"
 

src/engine/concepts/is_attachment.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "../rendering/pipelines/Attachment.hpp"
+#include "engine/rendering/pipelines/Attachment.hpp"
 
 namespace fgl::engine
 {

src/engine/descriptors/Descriptor.hpp

@@ -6,7 +6,7 @@
 
 #include <cstdint>
 
-#include "engine/buffers/Buffer.hpp"
+#include "engine/memory/buffers/Buffer.hpp"
 #include "engine/concepts/is_descriptor.hpp"
 
 namespace fgl::engine::descriptors

src/engine/descriptors/DescriptorSet.cpp

@@ -10,8 +10,8 @@
 #include <queue>
 
 #include "DescriptorPool.hpp"
-#include "engine/buffers/BufferSuballocation.hpp"
-#include "engine/image/ImageView.hpp"
+#include "engine/memory/buffers/BufferSuballocation.hpp"
+#include "engine/assets/image/ImageView.hpp"
 #include "engine/rendering/SwapChain.hpp"
 #include "engine/texture/Texture.hpp"
 

src/engine/descriptors/DescriptorSet.hpp

@@ -8,7 +8,7 @@
 
 #include <variant>
 
-#include "engine/buffers/BufferSuballocation.hpp"
+#include "engine/memory/buffers/BufferSuballocation.hpp"
 #include "engine/rendering/types.hpp"
 
 namespace fgl::engine

src/engine/filesystem/scanner/FileScanner.cpp

@@ -8,8 +8,10 @@
 
 #include "FileScanner.hpp"
 
+#include <unordered_map>
+
 #include "engine/FGL_DEFINES.hpp"
-#include "engine/logging/logging.hpp"
+#include "engine/debug/logging/logging.hpp"
 
 namespace fgl::engine::filesystem
 {

src/engine/memory/buffers/Buffer.cpp

@@ -6,8 +6,8 @@
 
 #include "BufferSuballocationHandle.hpp"
 #include "align.hpp"
-#include "engine/buffers/exceptions.hpp"
-#include "engine/literals/size.hpp"
+#include "engine/memory/buffers/exceptions.hpp"
+#include "engine/math/literals/size.hpp"
 #include "engine/rendering/devices/Device.hpp"
 
 namespace fgl::engine::memory

src/engine/memory/buffers/BufferSuballocation.cpp

@@ -8,7 +8,7 @@
 #include "BufferSuballocationHandle.hpp"
 #include "SuballocationView.hpp"
 #include "align.hpp"
-#include "engine/logging/logging.hpp"
+#include "engine/debug/logging/logging.hpp"
 
 namespace fgl::engine::memory
 {

src/engine/memory/buffers/BufferSuballocationHandle.cpp

@@ -6,7 +6,7 @@
 
 #include "Buffer.hpp"
 #include "BufferSuballocation.hpp"
-#include "engine/logging/logging.hpp"
+#include "engine/debug/logging/logging.hpp"
 
 namespace fgl::engine::memory
 {

src/engine/memory/buffers/vector/BufferVector.cpp

@@ -5,7 +5,7 @@
 #include "BufferVector.hpp"
 
 #include "engine/assets/TransferManager.hpp"
-#include "engine/buffers/Buffer.hpp"
+#include "engine/memory/buffers/Buffer.hpp"
 
 namespace fgl::engine::memory
 {

src/engine/memory/buffers/vector/BufferVector.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "engine/buffers/BufferSuballocation.hpp"
+#include "engine/memory/buffers/BufferSuballocation.hpp"
 
 namespace fgl::engine::memory
 {

src/engine/memory/buffers/vector/DeviceVector.hpp

@@ -7,8 +7,8 @@
 #include "BufferVector.hpp"
 #include "concepts.hpp"
 #include "engine/assets/TransferManager.hpp"
-#include "engine/literals/size.hpp"
-#include "engine/logging/logging.hpp"
+#include "engine/math/literals/size.hpp"
+#include "engine/debug/logging/logging.hpp"
 
 namespace fgl::engine
 {

src/engine/memory/buffers/vector/concepts.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "engine/buffers/BufferSuballocation.hpp"
+#include "engine/memory/buffers/BufferSuballocation.hpp"
 
 namespace fgl::engine::memory
 {

src/engine/primitives/boxes/OrientedBoundingBox.cpp

@@ -8,8 +8,8 @@
 
 #include <array>
 
-#include "engine/logging/logging.hpp"
-#include "engine/model/ModelVertex.hpp"
+#include "engine/debug/logging/logging.hpp"
+#include "engine/assets/model/ModelVertex.hpp"
 #include "engine/primitives/lines/LineSegment.hpp"
 #include "engine/primitives/points/Coordinate.hpp"
 

src/engine/primitives/boxes/OrientedBoundingBox.hpp

@@ -9,7 +9,6 @@
 
 #include "BoundingBox.hpp"
 #include "engine/constants.hpp"
-#include "engine/logging/logging.hpp"
 #include "engine/primitives/Scale.hpp"
 #include "engine/primitives/TransformComponent.hpp"
 #include "engine/primitives/matricies/Matrix.hpp"

src/engine/rendering/Instance.cpp

@@ -9,7 +9,7 @@
 #include <iostream>
 #include <unordered_set>
 
-#include "engine/logging/logging.hpp"
+#include "engine/debug/logging/logging.hpp"
 
 PFN_vkCreateDebugUtilsMessengerEXT pfnVkCreateDebugUtilsMessengerEXT { nullptr };
 PFN_vkDestroyDebugUtilsMessengerEXT pfnVkDestroyDebugUtilsMessengerEXT { nullptr };

src/engine/rendering/devices/Device.cpp

@@ -10,7 +10,7 @@
 #include <set>
 #include <unordered_set>
 
-#include "engine/logging/logging.hpp"
+#include "engine/debug/logging/logging.hpp"
 
 namespace fgl::engine
 {

src/engine/rendering/devices/PhysicalDevice.cpp

@@ -4,7 +4,7 @@
 
 #include "PhysicalDevice.hpp"
 
-#include "engine/logging/logging.hpp"
+#include "engine/debug/logging/logging.hpp"
 #include "engine/rendering/Instance.hpp"
 #include "engine/rendering/Surface.hpp"
 

src/engine/rendering/pipelines/Attachment.hpp

@@ -11,9 +11,9 @@
 #include <cstdint>
 #include <vector>
 
-#include "../../concepts/is_attachment.hpp"
-#include "../../image/Image.hpp"
-#include "../types.hpp"
+#include "engine/assets/image/Image.hpp"
+#include "engine/concepts/is_attachment.hpp"
+#include "engine/rendering/types.hpp"
 
 namespace fgl::engine
 {

src/engine/rendering/pipelines/PipelineConfigInfo.cpp

@@ -4,7 +4,7 @@
 
 #include "PipelineConfigInfo.hpp"
 
-#include "../../model/Model.hpp"
+#include "engine/assets/model/Model.hpp"
 
 namespace fgl::engine
 {

src/engine/rendering/pipelines/PipelineConfigInfo.hpp

@@ -10,7 +10,7 @@
 #include <cstdint>
 #include <vector>
 
-#include "../../FGL_DEFINES.hpp"
+#include "engine/FGL_DEFINES.hpp"
 
 namespace fgl::engine
 {

src/engine/rendering/pipelines/PipelineT.hpp

@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "../../concepts/is_descriptor_set_collection.hpp"
-#include "../../concepts/is_empty_descriptor_set.hpp"
-#include "../../descriptors/DescriptorSet.hpp"
+#include "engine/concepts/is_descriptor_set_collection.hpp"
+#include "engine/concepts/is_empty_descriptor_set.hpp"
+#include "engine/descriptors/DescriptorSet.hpp"
 #include "Pipeline.hpp"
 #include "Shader.hpp"
 

src/engine/rendering/pipelines/Shader.cpp

@@ -4,6 +4,7 @@
 
 #include "Shader.hpp"
 
+#include "engine/debug/logging/logging.hpp"
 #include "engine/rendering/devices/Device.hpp"
 #include "shaders/Compiler.hpp"
 
@@ -33,7 +34,7 @@ namespace fgl::engine
 		}
 	}
 
-	vk::ShaderModuleCreateInfo ShaderHandle::createModuleInfo()
+	vk::ShaderModuleCreateInfo ShaderHandle::createModuleInfo() const
 	{
 		vk::ShaderModuleCreateInfo module_info {};
 		module_info.flags = {};

src/engine/rendering/pipelines/Shader.hpp

@@ -6,10 +6,9 @@
 
 #include <vulkan/vulkan_raii.hpp>
 
+#include <filesystem>
 #include <fstream>
 
-#include "../../logging/logging.hpp"
-
 namespace fgl::engine
 {
 
@@ -39,8 +38,8 @@ namespace fgl::engine
 
 		vk::raii::ShaderModule shader_module;
 
-		std::vector< std::byte > loadData( const std::filesystem::path& );
-		vk::ShaderModuleCreateInfo createModuleInfo();
+		static std::vector< std::byte > loadData( const std::filesystem::path& );
+		vk::ShaderModuleCreateInfo createModuleInfo() const;
 
 		ShaderHandle( const std::filesystem::path& path, const vk::PipelineShaderStageCreateInfo& info );
 

src/engine/rendering/pipelines/shaders/Compiler.cpp

@@ -8,7 +8,7 @@
 #include <fstream>
 
 #include "engine/FGL_DEFINES.hpp"
-#include "engine/logging/logging.hpp"
+#include "engine/debug/logging/logging.hpp"
 
 namespace fgl::engine
 {

src/engine/systems/DrawPair.cpp

@@ -10,7 +10,7 @@
 
 #include "engine/debug/drawers.hpp"
 #include "engine/gameobjects/components/ModelComponent.hpp"
-#include "engine/model/Model.hpp"
+#include "engine/assets/model/Model.hpp"
 #include "engine/tree/octtree/OctTreeNode.hpp"
 
 namespace fgl::engine

src/engine/systems/EntityRendererSystem.cpp

@@ -9,7 +9,7 @@
 
 #include "DrawPair.hpp"
 #include "engine/camera/Camera.hpp"
-#include "engine/profiling/counters.hpp"
+#include "engine/debug/profiling/counters.hpp"
 #include "engine/tree/octtree/OctTreeNode.hpp"
 
 namespace fgl::engine

src/engine/systems/EntityRendererSystem.hpp

@@ -6,10 +6,10 @@
 
 #include <memory>
 
-#include "../rendering/pipelines/PipelineT.hpp"
-#include "engine/buffers/vector/HostVector.hpp"
-#include "engine/model/Model.hpp"
+#include "engine/assets/model/Model.hpp"
+#include "engine/memory/buffers/vector/HostVector.hpp"
 #include "engine/rendering/SwapChain.hpp"
+#include "engine/rendering/pipelines/PipelineT.hpp"
 #include "engine/systems/modelRendering/StandardPipeline.hpp"
 #include "engine/systems/modelRendering/TexturedPipeline.hpp"
 

src/engine/systems/GuiSystem.hpp

@@ -3,11 +3,11 @@
 //
 
 #pragma once
-#include "../rendering/pipelines/PipelineT.hpp"
-#include "../rendering/pipelines/Shader.hpp"
 #include "engine/FrameInfo.hpp"
 #include "engine/descriptors/DescriptorSetCollection.hpp"
 #include "engine/descriptors/DescriptorSetLayout.hpp"
+#include "engine/rendering/pipelines/PipelineT.hpp"
+#include "engine/rendering/pipelines/Shader.hpp"
 
 namespace fgl::engine
 {

src/engine/systems/LineDrawer.cpp

@@ -5,10 +5,10 @@
 #include "LineDrawer.hpp"
 
 #include "engine/FrameInfo.hpp"
-#include "engine/buffers/vector/HostVector.hpp"
+#include "engine/memory/buffers/vector/HostVector.hpp"
 #include "engine/camera/CameraDescriptor.hpp"
-#include "engine/model/ModelVertex.hpp"
-#include "engine/model/SimpleVertex.hpp"
+#include "engine/assets/model/ModelVertex.hpp"
+#include "engine/assets/model/SimpleVertex.hpp"
 #include "engine/primitives/points/Coordinate.hpp"
 
 namespace fgl::engine

src/engine/systems/LineDrawer.hpp

@@ -3,8 +3,8 @@
 //
 
 #pragma once
-#include "../rendering/pipelines/PipelineT.hpp"
-#include "engine/buffers/vector/HostVector.hpp"
+#include "engine/rendering/pipelines/PipelineT.hpp"
+#include "engine/memory/buffers/vector/HostVector.hpp"
 #include "engine/camera/CameraDescriptor.hpp"
 #include "engine/descriptors/Descriptor.hpp"
 #include "engine/descriptors/DescriptorSetCollection.hpp"

src/engine/systems/TerrainSystem.cpp

@@ -8,7 +8,7 @@
 
 #include "DrawPair.hpp"
 #include "engine/camera/Camera.hpp"
-#include "engine/literals/size.hpp"
+#include "engine/math/literals/size.hpp"
 
 namespace fgl::engine
 {

src/engine/systems/TerrainSystem.hpp

@@ -4,13 +4,13 @@
 
 #pragma once
 
-#include "../rendering/pipelines/PipelineT.hpp"
+#include "engine/rendering/pipelines/PipelineT.hpp"
 #include "concepts.hpp"
 #include "engine/FrameInfo.hpp"
-#include "engine/buffers/vector/HostVector.hpp"
+#include "engine/memory/buffers/vector/HostVector.hpp"
 #include "engine/camera/Camera.hpp"
 #include "engine/descriptors/DescriptorSetCollection.hpp"
-#include "engine/model/Model.hpp"
+#include "engine/assets/model/Model.hpp"
 #include "engine/rendering/SwapChain.hpp"
 
 namespace fgl::engine

src/engine/systems/modelRendering/StandardPipeline.hpp

@@ -3,11 +3,11 @@
 //
 
 #pragma once
-#include "../../rendering/pipelines/PipelineT.hpp"
-#include "../../rendering/pipelines/Shader.hpp"
 #include "engine/FrameInfo.hpp"
 #include "engine/camera/CameraDescriptor.hpp"
 #include "engine/descriptors/DescriptorSetCollection.hpp"
+#include "engine/rendering/pipelines/PipelineT.hpp"
+#include "engine/rendering/pipelines/Shader.hpp"
 
 namespace fgl::engine
 {

src/engine/systems/modelRendering/TexturedPipeline.hpp

@@ -3,10 +3,10 @@
 //
 
 #pragma once
-#include "../../rendering/pipelines/PipelineT.hpp"
-#include "../../rendering/pipelines/Shader.hpp"
 #include "engine/FrameInfo.hpp"
 #include "engine/descriptors/DescriptorSetCollection.hpp"
+#include "engine/rendering/pipelines/PipelineT.hpp"
+#include "engine/rendering/pipelines/Shader.hpp"
 
 namespace fgl::engine
 {

src/engine/texture/Texture.cpp

@@ -9,9 +9,9 @@
 #include "engine/FrameInfo.hpp"
 #include "engine/assets/TransferManager.hpp"
 #include "engine/descriptors/DescriptorSet.hpp"
-#include "engine/image/Image.hpp"
-#include "engine/image/ImageView.hpp"
-#include "engine/logging/logging.hpp"
+#include "engine/assets/image/Image.hpp"
+#include "engine/assets/image/ImageView.hpp"
+#include "engine/debug/logging/logging.hpp"
 #include "engine/math/noise/perlin/generator.hpp"
 
 #pragma GCC diagnostic push

src/engine/texture/Texture.hpp

@@ -9,8 +9,8 @@
 #include <filesystem>
 
 #include "engine/assets/AssetManager.hpp"
-#include "engine/image/ImageView.hpp"
-#include "engine/image/Sampler.hpp"
+#include "engine/assets/image/ImageView.hpp"
+#include "engine/assets/image/Sampler.hpp"
 
 namespace fgl::engine
 {

src/engine/tree/octtree/OctTreeNode.cpp

@@ -8,7 +8,7 @@
 #include <engine/FrameInfo.hpp>
 #include <glm/gtx/string_cast.hpp>
 
-#include "engine/model/Model.hpp"
+#include "engine/assets/model/Model.hpp"
 #include "engine/primitives/Frustum.hpp"
 
 namespace fgl::engine