data/

src/assets/AssetsLoader.cpp

@@ -8,7 +8,7 @@
 #include <constants.hpp>
 #include <content/Content.hpp>
 #include <content/ContentPack.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <debug/Logger.hpp>
 #include <files/engine_paths.hpp>
 #include <files/files.hpp>

src/assets/assetload_funcs.cpp

@@ -11,7 +11,7 @@
 #include <coders/json.hpp>
 #include <coders/obj.hpp>
 #include <constants.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <files/engine_paths.hpp>
 #include <files/files.hpp>
 #include "../frontend/UiDocument.hpp"

src/coders/binary_json.cpp

@@ -2,7 +2,7 @@
 
 #include <stdexcept>
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include "byte_utils.hpp"
 #include "gzip.hpp"
 

src/coders/binary_json.hpp

@@ -4,7 +4,7 @@
 #include <memory>
 #include <vector>
 
-#include "../data/dynamic_fwd.hpp"
+#include <data/dynamic_fwd.hpp>
 
 namespace dynamic {
     class Map;

src/coders/commons.hpp

@@ -4,7 +4,7 @@
 #include <stdexcept>
 #include <string>
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <typedefs.hpp>
 
 inline int is_box(int c) {

src/coders/json.cpp

@@ -6,7 +6,7 @@
 #include <memory>
 #include <sstream>
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <util/stringutil.hpp>
 #include "commons.hpp"
 

src/coders/json.hpp

@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <typedefs.hpp>
 #include "binary_json.hpp"
 

src/coders/toml.cpp

@@ -6,8 +6,8 @@
 #include <iomanip>
 #include <sstream>
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
-#include "../data/setting.hpp"
+#include <data/setting.hpp>
 #include <files/settings_io.hpp>
 #include <util/stringutil.hpp>
 #include "commons.hpp"

src/coders/toml.hpp

@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 
 class SettingsHandler;
 

src/content/Content.hpp

@@ -9,7 +9,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "../data/dynamic_fwd.hpp"
+#include <data/dynamic_fwd.hpp>
 #include "content_fwd.hpp"
 
 using DrawGroups = std::set<ubyte>;

src/content/ContentLUT.hpp

@@ -7,7 +7,7 @@
 #include <vector>
 
 #include <constants.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <typedefs.hpp>
 #include "Content.hpp"
 

src/content/ContentLoader.cpp

@@ -8,7 +8,7 @@
 
 #include <coders/json.hpp>
 #include <core_defs.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <debug/Logger.hpp>
 #include <files/files.hpp>
 #include <items/ItemDef.hpp>

src/content/ContentPack.cpp

@@ -5,7 +5,7 @@
 #include <utility>
 
 #include <coders/json.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <files/engine_paths.hpp>
 #include <files/files.hpp>
 

src/files/WorldConverter.cpp

@@ -6,7 +6,7 @@
 #include <utility>
 
 #include <content/ContentLUT.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <debug/Logger.hpp>
 #include <files/files.hpp>
 #include <objects/Player.hpp>

src/files/WorldFiles.cpp

@@ -13,7 +13,7 @@
 #include <constants.hpp>
 #include <content/Content.hpp>
 #include <core_defs.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <debug/Logger.hpp>
 #include <items/Inventory.hpp>
 #include <items/ItemDef.hpp>

src/files/WorldRegions.cpp

@@ -6,7 +6,7 @@
 
 #include <coders/byte_utils.hpp>
 #include <coders/rle.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <items/Inventory.hpp>
 #include "../maths/voxmaths.hpp"
 #include <util/data_io.hpp>

src/files/WorldRegions.hpp

@@ -9,7 +9,7 @@
 #include <mutex>
 #include <unordered_map>
 
-#include "../data/dynamic_fwd.hpp"
+#include <data/dynamic_fwd.hpp>
 #include <typedefs.hpp>
 #include <util/BufferPool.hpp>
 #include <voxels/Chunk.hpp>

src/files/files.cpp

@@ -11,7 +11,7 @@
 #include <coders/gzip.hpp>
 #include <coders/json.hpp>
 #include <coders/toml.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <util/stringutil.hpp>
 
 namespace fs = std::filesystem;

src/files/settings_io.hpp

@@ -6,7 +6,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 
 class Setting;
 struct EngineSettings;

src/frontend/locale.cpp

@@ -7,7 +7,7 @@
 #include <content/ContentPack.hpp>
 #include <files/files.hpp>
 #include <util/stringutil.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <debug/Logger.hpp>
 
 static debug::Logger logger("locale");

src/frontend/menu.cpp

@@ -6,7 +6,7 @@
 
 #include <delegates.hpp>
 #include <engine.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include "../interfaces/Task.hpp"
 #include <files/engine_paths.hpp>
 #include <graphics/ui/elements/Menu.hpp>

src/frontend/menu.hpp

@@ -1,7 +1,7 @@
 #ifndef FRONTEND_MENU_MENU_HPP_
 #define FRONTEND_MENU_MENU_HPP_
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <graphics/ui/elements/Menu.hpp>
 
 #include <string>

src/graphics/ui/elements/TrackBar.hpp

@@ -2,7 +2,7 @@
 #define GRAPHICS_UI_ELEMENTS_TRACKBAR_HPP_
 
 #include "UINode.hpp"
-#include "../../../data/dynamic_fwd.hpp"
+#include <data/dynamic_fwd.hpp>
 
 namespace gui {
     class TrackBar : public UINode {

src/items/Inventory.cpp

@@ -1,7 +1,7 @@
 #include "Inventory.hpp"
 
 #include <content/ContentLUT.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 
 Inventory::Inventory(int64_t id, size_t size) : id(id), slots(size) {
 }

src/logic/CommandsInterpreter.hpp

@@ -6,7 +6,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 
 namespace cmd {
     enum class ArgType { number, integer, enumvalue, selector, string };

src/logic/scripting/lua/libjson.cpp

@@ -1,5 +1,5 @@
 #include <coders/json.hpp>
-#include "../../../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include "api_lua.hpp"
 
 static int l_json_stringify(lua::State* L) {

src/logic/scripting/lua/libtoml.cpp

@@ -1,5 +1,5 @@
 #include <coders/toml.hpp>
-#include "../../../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include "api_lua.hpp"
 
 using namespace scripting;

src/logic/scripting/lua/lua_engine.hpp

@@ -4,7 +4,7 @@
 #include <stdexcept>
 #include <string>
 
-#include "../../../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <delegates.hpp>
 #include "../scripting_functional.hpp"
 #include "lua_util.hpp"

src/logic/scripting/scripting.hpp

@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include "../../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <delegates.hpp>
 #include <typedefs.hpp>
 #include "scripting_functional.hpp"

src/logic/scripting/scripting_functional.hpp

@@ -4,7 +4,7 @@
 #include <glm/glm.hpp>
 #include <string>
 
-#include "../../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include <delegates.hpp>
 #include <typedefs.hpp>
 

src/objects/Entities.cpp

@@ -5,7 +5,7 @@
 
 #include <assets/Assets.hpp>
 #include <content/Content.hpp>
-#include "../data/dynamic_util.hpp"
+#include <data/dynamic_util.hpp>
 #include <debug/Logger.hpp>
 #include <engine.hpp>
 #include <graphics/core/DrawContext.hpp>

src/objects/Entities.hpp

@@ -6,7 +6,7 @@
 #include <optional>
 #include <vector>
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include "../physics/Hitbox.hpp"
 #include <typedefs.hpp>
 #include <util/Clock.hpp>

src/objects/Player.hpp

@@ -5,7 +5,7 @@
 #include <memory>
 #include <optional>
 
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include "../interfaces/Object.hpp"
 #include "../interfaces/Serializable.hpp"
 #include <settings.hpp>

src/objects/rigging.cpp

@@ -2,7 +2,7 @@
 
 #include <assets/Assets.hpp>
 #include <coders/json.hpp>
-#include "../data/dynamic_util.hpp"
+#include <data/dynamic_util.hpp>
 #include <graphics/core/Model.hpp>
 #include <graphics/render/ModelBatch.hpp>
 

src/settings.hpp

@@ -4,7 +4,7 @@
 #include <string>
 #include <unordered_map>
 
-#include "data/setting.hpp"
+#include <data/setting.hpp>
 #include <constants.hpp>
 #include <typedefs.hpp>
 

src/window/Events.cpp

@@ -167,7 +167,7 @@ void Events::setPosition(float xpos, float ypos) {
 
 #include <coders/json.hpp>
 #include <coders/toml.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 
 std::string Events::writeBindings() {
     dynamic::Map obj;

src/world/Level.cpp

@@ -1,7 +1,7 @@
 #include "Level.hpp"
 
 #include <content/Content.hpp>
-#include "../data/dynamic_util.hpp"
+#include <data/dynamic_util.hpp>
 #include <items/Inventories.hpp>
 #include <items/Inventory.hpp>
 #include "../lighting/Lighting.hpp"

src/world/World.hpp

@@ -7,7 +7,7 @@
 #include <vector>
 
 #include <content/ContentPack.hpp>
-#include "../data/dynamic.hpp"
+#include <data/dynamic.hpp>
 #include "../interfaces/Serializable.hpp"
 #include <typedefs.hpp>
 #include <util/timeutil.hpp>