voxels/

src/assets/AssetsLoader.cpp

@@ -16,7 +16,7 @@
 #include "../logic/scripting/scripting.hpp"
 #include <objects/rigging.hpp>
 #include <util/ThreadPool.hpp>
-#include "../voxels/Block.hpp"
+#include <voxels/Block.hpp>
 #include "Assets.hpp"
 #include "assetload_funcs.hpp"
 

src/content/Content.cpp

@@ -9,7 +9,7 @@
 #include "../logic/scripting/scripting.hpp"
 #include <objects/EntityDef.hpp>
 #include <objects/rigging.hpp>
-#include "../voxels/Block.hpp"
+#include <voxels/Block.hpp>
 #include "ContentPack.hpp"
 
 ContentIndices::ContentIndices(

src/content/ContentBuilder.hpp

@@ -9,7 +9,7 @@
 #include "ContentPack.hpp"
 #include <items/ItemDef.hpp>
 #include <objects/EntityDef.hpp>
-#include "../voxels/Block.hpp"
+#include <voxels/Block.hpp>
 
 template <class T>
 class ContentUnitBuilder {

src/content/ContentLUT.cpp

@@ -6,7 +6,7 @@
 #include <constants.hpp>
 #include <files/files.hpp>
 #include <items/ItemDef.hpp>
-#include "../voxels/Block.hpp"
+#include <voxels/Block.hpp>
 #include "Content.hpp"
 
 ContentLUT::ContentLUT(

src/content/ContentLoader.cpp

@@ -17,7 +17,7 @@
 #include <typedefs.hpp>
 #include <util/listutil.hpp>
 #include <util/stringutil.hpp>
-#include "../voxels/Block.hpp"
+#include <voxels/Block.hpp>
 #include "Content.hpp"
 #include "ContentBuilder.hpp"
 #include "ContentPack.hpp"

src/core_defs.cpp

@@ -8,7 +8,7 @@
 #include "window/Window.hpp"
 #include "window/Events.hpp"
 #include "window/input.hpp"
-#include "voxels/Block.hpp"
+#include <voxels/Block.hpp>
 
 // All in-game definitions (blocks, items, etc..)
 void corecontent::setup(EnginePaths* paths, ContentBuilder* builder) {

src/engine.cpp

@@ -30,8 +30,8 @@
 #include "logic/scripting/scripting.hpp"
 #include <util/listutil.hpp>
 #include <util/platform.hpp>
-#include "voxels/DefaultWorldGenerator.hpp"
+#include <voxels/DefaultWorldGenerator.hpp>
-#include "voxels/FlatWorldGenerator.hpp"
+#include <voxels/FlatWorldGenerator.hpp>
 #include "window/Camera.hpp"
 #include "window/Events.hpp"
 #include "window/input.hpp"

src/files/WorldConverter.cpp

@@ -11,7 +11,7 @@
 #include <files/files.hpp>
 #include <objects/Player.hpp>
 #include <util/ThreadPool.hpp>
-#include "../voxels/Chunk.hpp"
+#include <voxels/Chunk.hpp>
 #include "WorldFiles.hpp"
 
 namespace fs = std::filesystem;

src/files/WorldFiles.cpp

@@ -25,9 +25,9 @@
 #include <settings.hpp>
 #include <typedefs.hpp>
 #include <util/data_io.hpp>
-#include "../voxels/Block.hpp"
+#include <voxels/Block.hpp>
-#include "../voxels/Chunk.hpp"
+#include <voxels/Chunk.hpp>
-#include "../voxels/voxel.hpp"
+#include <voxels/voxel.hpp>
 #include "../window/Camera.hpp"
 #include "../world/World.hpp"
 

src/files/WorldFiles.hpp

@@ -9,7 +9,7 @@
 
 #include <content/ContentPack.hpp>
 #include <typedefs.hpp>
-#include "../voxels/Chunk.hpp"
+#include <voxels/Chunk.hpp>
 #include "WorldRegions.hpp"
 #include "files.hpp"
 #define GLM_ENABLE_EXPERIMENTAL

src/files/WorldRegions.hpp

@@ -12,7 +12,7 @@
 #include "../data/dynamic_fwd.hpp"
 #include <typedefs.hpp>
 #include <util/BufferPool.hpp>
-#include "../voxels/Chunk.hpp"
+#include <voxels/Chunk.hpp>
 #include "files.hpp"
 #define GLM_ENABLE_EXPERIMENTAL
 #include "glm/gtx/hash.hpp"

src/frontend/ContentGfxCache.cpp

@@ -8,7 +8,7 @@
 #include <core_defs.hpp>
 #include <graphics/core/Atlas.hpp>
 #include "../maths/UVRegion.hpp"
-#include "../voxels/Block.hpp"
+#include <voxels/Block.hpp>
 
 #include <string>
 

src/frontend/LevelFrontend.cpp

@@ -10,7 +10,7 @@
 #include "../logic/LevelController.hpp"
 #include "../logic/PlayerController.hpp"
 #include <objects/Player.hpp>
-#include "../voxels/Block.hpp"
+#include <voxels/Block.hpp>
 #include "../world/Level.hpp"
 
 LevelFrontend::LevelFrontend(

src/frontend/debug_panel.cpp

@@ -15,9 +15,9 @@
 #include <objects/EntityDef.hpp>
 #include "../physics/Hitbox.hpp"
 #include <util/stringutil.hpp>
-#include "../voxels/Block.hpp"
+#include <voxels/Block.hpp>
-#include "../voxels/Chunk.hpp"
+#include <voxels/Chunk.hpp>
-#include "../voxels/Chunks.hpp"
+#include <voxels/Chunks.hpp>
 #include "../world/Level.hpp"
 #include "../world/World.hpp"
 

src/frontend/hud.cpp

@@ -34,9 +34,9 @@
 #include "../physics/Hitbox.hpp"
 #include <typedefs.hpp>
 #include <util/stringutil.hpp>
-#include "../voxels/Block.hpp"
+#include <voxels/Block.hpp>
-#include "../voxels/Chunk.hpp"
+#include <voxels/Chunk.hpp>
-#include "../voxels/Chunks.hpp"
+#include <voxels/Chunks.hpp>
 #include "../window/Camera.hpp"
 #include "../window/Events.hpp"
 #include "../window/input.hpp"

src/frontend/screens/LevelScreen.cpp

@@ -20,7 +20,7 @@
 #include "../../logic/scripting/scripting_hud.hpp"
 #include <util/stringutil.hpp>
 #include "../../physics/Hitbox.hpp"
-#include "../../voxels/Chunks.hpp"
+#include <voxels/Chunks.hpp>
 #include "../../window/Camera.hpp"
 #include "../../window/Events.hpp"
 #include "../../window/Window.hpp"

src/graphics/render/BlocksPreview.cpp

@@ -4,7 +4,7 @@
 #include <constants.hpp>
 #include <content/Content.hpp>
 #include "../../frontend/ContentGfxCache.hpp"
-#include "../../voxels/Block.hpp"
+#include <voxels/Block.hpp>
 #include "../../window/Camera.hpp"
 #include "../../window/Window.hpp"
 #include <graphics/core/Atlas.hpp>

src/graphics/render/BlocksRenderer.cpp

@@ -4,10 +4,10 @@
 #include "../../maths/UVRegion.hpp"
 #include <constants.hpp>
 #include <content/Content.hpp>
-#include "../../voxels/Block.hpp"
+#include <voxels/Block.hpp>
-#include "../../voxels/Chunk.hpp"
+#include <voxels/Chunk.hpp>
-#include "../../voxels/VoxelsVolume.hpp"
+#include <voxels/VoxelsVolume.hpp>
-#include "../../voxels/ChunksStorage.hpp"
+#include <voxels/ChunksStorage.hpp>
 #include "../../lighting/Lightmap.hpp"
 #include "../../frontend/ContentGfxCache.hpp"
 #include <settings.hpp>

src/graphics/render/BlocksRenderer.hpp

@@ -5,7 +5,7 @@
 #include <vector>
 #include <memory>
 #include <glm/glm.hpp>
-#include "../../voxels/voxel.hpp"
+#include <voxels/voxel.hpp>
 #include <typedefs.hpp>
 
 class Content;

src/graphics/render/ChunksRenderer.cpp

@@ -2,7 +2,7 @@
 #include "BlocksRenderer.hpp"
 #include <debug/Logger.hpp>
 #include <graphics/core/Mesh.hpp>
-#include "../../voxels/Chunk.hpp"
+#include <voxels/Chunk.hpp>
 #include "../../world/Level.hpp"
 #include <settings.hpp>
 

src/graphics/render/ChunksRenderer.hpp

@@ -7,8 +7,8 @@
 #include <unordered_map>
 #include <glm/glm.hpp>
 
-#include "../../voxels/Block.hpp"
+#include <voxels/Block.hpp>
-#include "../../voxels/ChunksStorage.hpp"
+#include <voxels/ChunksStorage.hpp>
 #include <util/ThreadPool.hpp>
 
 class Mesh;

src/graphics/render/ModelBatch.cpp

@@ -6,7 +6,7 @@
 #include <graphics/core/Texture.hpp>
 #include <assets/Assets.hpp>
 #include "../../window/Window.hpp"
-#include "../../voxels/Chunks.hpp"
+#include <voxels/Chunks.hpp>
 #include "../../lighting/Lightmap.hpp"
 
 #define GLM_ENABLE_EXPERIMENTAL

src/graphics/render/WorldRenderer.cpp

@@ -22,9 +22,9 @@
 #include <objects/Entities.hpp>
 #include <objects/Player.hpp>
 #include <settings.hpp>
-#include "../../voxels/Block.hpp"
+#include <voxels/Block.hpp>
-#include "../../voxels/Chunk.hpp"
+#include <voxels/Chunk.hpp>
-#include "../../voxels/Chunks.hpp"
+#include <voxels/Chunks.hpp>
 #include "../../window/Camera.hpp"
 #include "../../window/Window.hpp"
 #include "../../world/Level.hpp"

src/graphics/ui/elements/InventoryView.cpp

@@ -12,7 +12,7 @@
 #include "../../../maths/voxmaths.hpp"
 #include <objects/Player.hpp>
 #include <util/stringutil.hpp>
-#include "../../../voxels/Block.hpp"
+#include <voxels/Block.hpp>
 #include "../../../window/Events.hpp"
 #include "../../../window/input.hpp"
 #include "../../../world/Level.hpp"

src/lighting/LightSolver.cpp

@@ -3,10 +3,10 @@
 #include "LightSolver.hpp"
 #include "Lightmap.hpp"
 #include <content/Content.hpp>
-#include "../voxels/Chunks.hpp"
+#include <voxels/Chunks.hpp>
-#include "../voxels/Chunk.hpp"
+#include <voxels/Chunk.hpp>
-#include "../voxels/voxel.hpp"
+#include <voxels/voxel.hpp>
-#include "../voxels/Block.hpp"
+#include <voxels/Block.hpp>
 
 LightSolver::LightSolver(const ContentIndices* contentIds, Chunks* chunks, int channel) 
 	: contentIds(contentIds), 

src/lighting/Lighting.cpp

@@ -2,10 +2,10 @@
 #include "LightSolver.hpp"
 #include "Lightmap.hpp"
 #include <content/Content.hpp>
-#include "../voxels/Chunks.hpp"
+#include <voxels/Chunks.hpp>
-#include "../voxels/Chunk.hpp"
+#include <voxels/Chunk.hpp>
-#include "../voxels/voxel.hpp"
+#include <voxels/voxel.hpp>
-#include "../voxels/Block.hpp"
+#include <voxels/Block.hpp>
 #include <constants.hpp>
 #include <util/timeutil.hpp>
 

src/logic/BlocksController.cpp

@@ -6,10 +6,10 @@
 #include "../lighting/Lighting.hpp"
 #include "../maths/fastmaths.hpp"
 #include <util/timeutil.hpp>
-#include "../voxels/Block.hpp"
+#include <voxels/Block.hpp>
-#include "../voxels/Chunk.hpp"
+#include <voxels/Chunk.hpp>
-#include "../voxels/Chunks.hpp"
+#include <voxels/Chunks.hpp>
-#include "../voxels/voxel.hpp"
+#include <voxels/voxel.hpp>
 #include "../world/Level.hpp"
 #include "../world/World.hpp"
 #include "scripting/scripting.hpp"

src/logic/BlocksController.hpp

@@ -7,7 +7,7 @@
 #include "../maths/fastmaths.hpp"
 #include <typedefs.hpp>
 #include <util/Clock.hpp>
-#include "../voxels/voxel.hpp"
+#include <voxels/voxel.hpp>
 
 class Player;
 class Block;

src/logic/ChunksController.cpp

@@ -11,11 +11,11 @@
 #include "../lighting/Lighting.hpp"
 #include "../maths/voxmaths.hpp"
 #include <util/timeutil.hpp>
-#include "../voxels/Block.hpp"
+#include <voxels/Block.hpp>
-#include "../voxels/Chunk.hpp"
+#include <voxels/Chunk.hpp>
-#include "../voxels/Chunks.hpp"
+#include <voxels/Chunks.hpp>
-#include "../voxels/ChunksStorage.hpp"
+#include <voxels/ChunksStorage.hpp>
-#include "../voxels/WorldGenerator.hpp"
+#include <voxels/WorldGenerator.hpp>
 #include "../world/Level.hpp"
 #include "../world/World.hpp"
 #include "../world/WorldGenerators.hpp"

src/logic/PlayerController.cpp

@@ -15,9 +15,9 @@
 #include "../physics/Hitbox.hpp"
 #include "../physics/PhysicsSolver.hpp"
 #include <settings.hpp>
-#include "../voxels/Block.hpp"
+#include <voxels/Block.hpp>
-#include "../voxels/Chunks.hpp"
+#include <voxels/Chunks.hpp>
-#include "../voxels/voxel.hpp"
+#include <voxels/voxel.hpp>
 #include "../window/Camera.hpp"
 #include "../window/Events.hpp"
 #include "../window/Window.hpp"

src/logic/scripting/lua/libblock.cpp

@@ -2,10 +2,10 @@
 #include "../../../lighting/Lighting.hpp"
 #include "../../../logic/BlocksController.hpp"
 #include "../../../logic/LevelController.hpp"
-#include "../../../voxels/Block.hpp"
+#include <voxels/Block.hpp>
-#include "../../../voxels/Chunk.hpp"
+#include <voxels/Chunk.hpp>
-#include "../../../voxels/Chunks.hpp"
+#include <voxels/Chunks.hpp>
-#include "../../../voxels/voxel.hpp"
+#include <voxels/voxel.hpp>
 #include "../../../world/Level.hpp"
 #include "api_lua.hpp"
 

src/logic/scripting/lua/libentity.cpp

@@ -7,7 +7,7 @@
 #include <objects/Player.hpp>
 #include <objects/rigging.hpp>
 #include "../../../physics/Hitbox.hpp"
-#include "../../../voxels/Chunks.hpp"
+#include <voxels/Chunks.hpp>
 #include "../../../window/Camera.hpp"
 
 using namespace scripting;

src/logic/scripting/lua/libhud.cpp

@@ -11,9 +11,9 @@
 #include "../../../logic/BlocksController.hpp"
 #include <objects/Player.hpp>
 #include <util/stringutil.hpp>
-#include "../../../voxels/Block.hpp"
+#include <voxels/Block.hpp>
-#include "../../../voxels/Chunks.hpp"
+#include <voxels/Chunks.hpp>
-#include "../../../voxels/voxel.hpp"
+#include <voxels/voxel.hpp>
 #include "../../../world/Level.hpp"
 #include "api_lua.hpp"
 

src/logic/scripting/scripting.cpp

@@ -19,7 +19,7 @@
 #include <objects/Player.hpp>
 #include <util/stringutil.hpp>
 #include <util/timeutil.hpp>
-#include "../../voxels/Block.hpp"
+#include <voxels/Block.hpp>
 #include "../../world/Level.hpp"
 #include "lua/lua_engine.hpp"
 

src/objects/Player.cpp

@@ -10,7 +10,7 @@
 #include "rigging.hpp"
 #include "../physics/Hitbox.hpp"
 #include "../physics/PhysicsSolver.hpp"
-#include "../voxels/Chunks.hpp"
+#include <voxels/Chunks.hpp>
 #include "../window/Camera.hpp"
 #include "../window/Events.hpp"
 #include "../world/Level.hpp"

src/objects/Player.hpp

@@ -9,7 +9,7 @@
 #include "../interfaces/Object.hpp"
 #include "../interfaces/Serializable.hpp"
 #include <settings.hpp>
-#include "../voxels/voxel.hpp"
+#include <voxels/voxel.hpp>
 
 class Camera;
 class Inventory;

src/physics/PhysicsSolver.cpp

@@ -2,9 +2,9 @@
 #include "Hitbox.hpp"
 
 #include "../maths/aabb.hpp"
-#include "../voxels/Block.hpp"
+#include <voxels/Block.hpp>
-#include "../voxels/Chunks.hpp"
+#include <voxels/Chunks.hpp>
-#include "../voxels/voxel.hpp"
+#include <voxels/voxel.hpp>
 
 #include <iostream>
 #define GLM_ENABLE_EXPERIMENTAL

src/physics/PhysicsSolver.hpp

@@ -4,7 +4,7 @@
 #include "Hitbox.hpp"
 
 #include <typedefs.hpp>
-#include "../voxels/voxel.hpp"
+#include <voxels/voxel.hpp>
 
 #include <vector>
 #include <glm/glm.hpp>

src/voxels/DefaultWorldGenerator.hpp

@@ -2,7 +2,7 @@
 #define VOXELS_DEFAULTWORLDGENERATOR_HPP_
 
 #include <typedefs.hpp>
-#include "../voxels/WorldGenerator.hpp"
+#include "WorldGenerator.hpp"
 
 struct voxel;
 class Content;

src/voxels/FlatWorldGenerator.hpp

@@ -2,7 +2,7 @@
 #define VOXELS_FLATWORLDGENERATOR_HPP_
 
 #include <typedefs.hpp>
-#include "../voxels/WorldGenerator.hpp"
+#include "WorldGenerator.hpp"
 
 struct voxel;
 class Content;

src/world/Level.cpp

@@ -10,9 +10,9 @@
 #include "../physics/Hitbox.hpp"
 #include "../physics/PhysicsSolver.hpp"
 #include <settings.hpp>
-#include "../voxels/Chunk.hpp"
+#include <voxels/Chunk.hpp>
-#include "../voxels/Chunks.hpp"
+#include <voxels/Chunks.hpp>
-#include "../voxels/ChunksStorage.hpp"
+#include <voxels/ChunksStorage.hpp>
 #include "../window/Camera.hpp"
 #include "LevelEvents.hpp"
 #include "World.hpp"

src/world/LevelEvents.cpp

@@ -1,6 +1,6 @@
 #include "LevelEvents.hpp"
 
-#include "../voxels/Chunk.hpp"
+#include <voxels/Chunk.hpp>
 
 using std::vector;
 

src/world/World.cpp

@@ -12,9 +12,9 @@
 #include <objects/Entities.hpp>
 #include <objects/Player.hpp>
 #include <settings.hpp>
-#include "../voxels/Chunk.hpp"
+#include <voxels/Chunk.hpp>
-#include "../voxels/Chunks.hpp"
+#include <voxels/Chunks.hpp>
-#include "../voxels/ChunksStorage.hpp"
+#include <voxels/ChunksStorage.hpp>
 #include "../world/WorldGenerators.hpp"
 #include "Level.hpp"
 

src/world/WorldGenerators.cpp

@@ -3,8 +3,8 @@
 #include <iostream>
 
 #include <content/Content.hpp>
-#include "../voxels/FlatWorldGenerator.hpp"
+#include <voxels/FlatWorldGenerator.hpp>
-#include "../voxels/WorldGenerator.hpp"
+#include <voxels/WorldGenerator.hpp>
 
 std::vector<std::string> WorldGenerators::getGeneratorsIDs() {
     std::vector<std::string> ids;

src/world/WorldGenerators.hpp

@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#include "../voxels/WorldGenerator.hpp"
+#include <voxels/WorldGenerator.hpp>
 
 class Content;