update project includes format
This commit is contained in:
@@ -5,13 +5,13 @@
|
||||
#include <stdexcept>
|
||||
#include <utility>
|
||||
|
||||
#include <content/ContentLUT.hpp>
|
||||
#include <data/dynamic.hpp>
|
||||
#include <debug/Logger.hpp>
|
||||
#include <files/files.hpp>
|
||||
#include <objects/Player.hpp>
|
||||
#include <util/ThreadPool.hpp>
|
||||
#include <voxels/Chunk.hpp>
|
||||
#include "content/ContentLUT.hpp"
|
||||
#include "data/dynamic.hpp"
|
||||
#include "debug/Logger.hpp"
|
||||
#include "files/files.hpp"
|
||||
#include "objects/Player.hpp"
|
||||
#include "util/ThreadPool.hpp"
|
||||
#include "voxels/Chunk.hpp"
|
||||
#include "WorldFiles.hpp"
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
#include <memory>
|
||||
#include <queue>
|
||||
|
||||
#include <delegates.hpp>
|
||||
#include <interfaces/Task.hpp>
|
||||
#include <typedefs.hpp>
|
||||
#include "delegates.hpp"
|
||||
#include "interfaces/Task.hpp"
|
||||
#include "typedefs.hpp"
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
|
||||
+22
-22
@@ -8,28 +8,28 @@
|
||||
#include <sstream>
|
||||
#include <utility>
|
||||
|
||||
#include <coders/byte_utils.hpp>
|
||||
#include <coders/json.hpp>
|
||||
#include <constants.hpp>
|
||||
#include <content/Content.hpp>
|
||||
#include <core_defs.hpp>
|
||||
#include <data/dynamic.hpp>
|
||||
#include <debug/Logger.hpp>
|
||||
#include <items/Inventory.hpp>
|
||||
#include <items/ItemDef.hpp>
|
||||
#include <lighting/Lightmap.hpp>
|
||||
#include <maths/voxmaths.hpp>
|
||||
#include <objects/EntityDef.hpp>
|
||||
#include <objects/Player.hpp>
|
||||
#include <physics/Hitbox.hpp>
|
||||
#include <settings.hpp>
|
||||
#include <typedefs.hpp>
|
||||
#include <util/data_io.hpp>
|
||||
#include <voxels/Block.hpp>
|
||||
#include <voxels/Chunk.hpp>
|
||||
#include <voxels/voxel.hpp>
|
||||
#include <window/Camera.hpp>
|
||||
#include <world/World.hpp>
|
||||
#include "coders/byte_utils.hpp"
|
||||
#include "coders/json.hpp"
|
||||
#include "constants.hpp"
|
||||
#include "content/Content.hpp"
|
||||
#include "core_defs.hpp"
|
||||
#include "data/dynamic.hpp"
|
||||
#include "debug/Logger.hpp"
|
||||
#include "items/Inventory.hpp"
|
||||
#include "items/ItemDef.hpp"
|
||||
#include "lighting/Lightmap.hpp"
|
||||
#include "maths/voxmaths.hpp"
|
||||
#include "objects/EntityDef.hpp"
|
||||
#include "objects/Player.hpp"
|
||||
#include "physics/Hitbox.hpp"
|
||||
#include "settings.hpp"
|
||||
#include "typedefs.hpp"
|
||||
#include "util/data_io.hpp"
|
||||
#include "voxels/Block.hpp"
|
||||
#include "voxels/Chunk.hpp"
|
||||
#include "voxels/voxel.hpp"
|
||||
#include "window/Camera.hpp"
|
||||
#include "world/World.hpp"
|
||||
|
||||
#define WORLD_FORMAT_MAGIC ".VOXWLD"
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include <content/ContentPack.hpp>
|
||||
#include <typedefs.hpp>
|
||||
#include <voxels/Chunk.hpp>
|
||||
#include "content/ContentPack.hpp"
|
||||
#include "typedefs.hpp"
|
||||
#include "voxels/Chunk.hpp"
|
||||
#include "WorldRegions.hpp"
|
||||
#include "files.hpp"
|
||||
#define GLM_ENABLE_EXPERIMENTAL
|
||||
#include "glm/gtx/hash.hpp"
|
||||
#include <glm/gtx/hash.hpp>
|
||||
|
||||
inline constexpr uint WORLD_FORMAT_VERSION = 1;
|
||||
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include <coders/byte_utils.hpp>
|
||||
#include <coders/rle.hpp>
|
||||
#include <data/dynamic.hpp>
|
||||
#include <items/Inventory.hpp>
|
||||
#include <maths/voxmaths.hpp>
|
||||
#include <util/data_io.hpp>
|
||||
#include "coders/byte_utils.hpp"
|
||||
#include "coders/rle.hpp"
|
||||
#include "data/dynamic.hpp"
|
||||
#include "items/Inventory.hpp"
|
||||
#include "maths/voxmaths.hpp"
|
||||
#include "util/data_io.hpp"
|
||||
|
||||
#define REGION_FORMAT_MAGIC ".VOXREG"
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
#include <mutex>
|
||||
#include <unordered_map>
|
||||
|
||||
#include <data/dynamic_fwd.hpp>
|
||||
#include <typedefs.hpp>
|
||||
#include <util/BufferPool.hpp>
|
||||
#include <voxels/Chunk.hpp>
|
||||
#include "data/dynamic_fwd.hpp"
|
||||
#include "typedefs.hpp"
|
||||
#include "util/BufferPool.hpp"
|
||||
#include "voxels/Chunk.hpp"
|
||||
#include "files.hpp"
|
||||
#define GLM_ENABLE_EXPERIMENTAL
|
||||
#include "glm/gtx/hash.hpp"
|
||||
#include <glm/gtx/hash.hpp>
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
#include <filesystem>
|
||||
#include <sstream>
|
||||
#include <stack>
|
||||
#include <typedefs.hpp>
|
||||
#include <util/stringutil.hpp>
|
||||
#include "typedefs.hpp"
|
||||
#include "util/stringutil.hpp"
|
||||
#include <utility>
|
||||
|
||||
#include "WorldFiles.hpp"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include <content/ContentPack.hpp>
|
||||
#include "content/ContentPack.hpp"
|
||||
|
||||
|
||||
class files_access_error : public std::runtime_error {
|
||||
|
||||
+6
-6
@@ -7,12 +7,12 @@
|
||||
#include <memory>
|
||||
#include <stdexcept>
|
||||
|
||||
#include <coders/commons.hpp>
|
||||
#include <coders/gzip.hpp>
|
||||
#include <coders/json.hpp>
|
||||
#include <coders/toml.hpp>
|
||||
#include <data/dynamic.hpp>
|
||||
#include <util/stringutil.hpp>
|
||||
#include "coders/commons.hpp"
|
||||
#include "coders/gzip.hpp"
|
||||
#include "coders/json.hpp"
|
||||
#include "coders/toml.hpp"
|
||||
#include "data/dynamic.hpp"
|
||||
#include "util/stringutil.hpp"
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
|
||||
@@ -3,12 +3,12 @@
|
||||
#include <memory>
|
||||
#include <utility>
|
||||
|
||||
#include <coders/json.hpp>
|
||||
#include <coders/toml.hpp>
|
||||
#include <debug/Logger.hpp>
|
||||
#include <settings.hpp>
|
||||
#include <window/Events.hpp>
|
||||
#include <window/input.hpp>
|
||||
#include "coders/json.hpp"
|
||||
#include "coders/toml.hpp"
|
||||
#include "debug/Logger.hpp"
|
||||
#include "settings.hpp"
|
||||
#include "window/Events.hpp"
|
||||
#include "window/input.hpp"
|
||||
|
||||
static debug::Logger logger("settings_io");
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
|
||||
#include <data/dynamic.hpp>
|
||||
#include "data/dynamic.hpp"
|
||||
|
||||
class Setting;
|
||||
struct EngineSettings;
|
||||
|
||||
Reference in New Issue
Block a user