update project includes format
This commit is contained in:
@@ -2,8 +2,8 @@
|
||||
|
||||
#include <utility>
|
||||
|
||||
#include <core_defs.hpp>
|
||||
#include <util/stringutil.hpp>
|
||||
#include "core_defs.hpp"
|
||||
#include "util/stringutil.hpp"
|
||||
|
||||
std::string to_string(BlockModel model) {
|
||||
switch (model) {
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include <maths/UVRegion.hpp>
|
||||
#include <maths/aabb.hpp>
|
||||
#include <typedefs.hpp>
|
||||
#include "maths/UVRegion.hpp"
|
||||
#include "maths/aabb.hpp"
|
||||
#include "typedefs.hpp"
|
||||
|
||||
inline std::string BLOCK_ITEM_SUFFIX = ".item";
|
||||
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
#include <utility>
|
||||
|
||||
#include <content/ContentLUT.hpp>
|
||||
#include <items/Inventory.hpp>
|
||||
#include <lighting/Lightmap.hpp>
|
||||
#include "content/ContentLUT.hpp"
|
||||
#include "items/Inventory.hpp"
|
||||
#include "lighting/Lightmap.hpp"
|
||||
#include "voxel.hpp"
|
||||
|
||||
Chunk::Chunk(int xpos, int zpos) : x(xpos), z(zpos) {
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
#include <memory>
|
||||
#include <unordered_map>
|
||||
|
||||
#include <constants.hpp>
|
||||
#include <lighting/Lightmap.hpp>
|
||||
#include "constants.hpp"
|
||||
#include "lighting/Lightmap.hpp"
|
||||
#include "voxel.hpp"
|
||||
|
||||
inline constexpr int CHUNK_DATA_LEN = CHUNK_VOL * 4;
|
||||
|
||||
+12
-12
@@ -6,18 +6,18 @@
|
||||
#include <algorithm>
|
||||
#include <vector>
|
||||
|
||||
#include <coders/byte_utils.hpp>
|
||||
#include <coders/json.hpp>
|
||||
#include <content/Content.hpp>
|
||||
#include <files/WorldFiles.hpp>
|
||||
#include <graphics/core/Mesh.hpp>
|
||||
#include <lighting/Lightmap.hpp>
|
||||
#include <maths/aabb.hpp>
|
||||
#include <maths/rays.hpp>
|
||||
#include <maths/voxmaths.hpp>
|
||||
#include <objects/Entities.hpp>
|
||||
#include <world/Level.hpp>
|
||||
#include <world/LevelEvents.hpp>
|
||||
#include "coders/byte_utils.hpp"
|
||||
#include "coders/json.hpp"
|
||||
#include "content/Content.hpp"
|
||||
#include "files/WorldFiles.hpp"
|
||||
#include "graphics/core/Mesh.hpp"
|
||||
#include "lighting/Lightmap.hpp"
|
||||
#include "maths/aabb.hpp"
|
||||
#include "maths/rays.hpp"
|
||||
#include "maths/voxmaths.hpp"
|
||||
#include "objects/Entities.hpp"
|
||||
#include "world/Level.hpp"
|
||||
#include "world/LevelEvents.hpp"
|
||||
#include "Block.hpp"
|
||||
#include "Chunk.hpp"
|
||||
#include "WorldGenerator.hpp"
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
#include "voxel.hpp"
|
||||
|
||||
class VoxelRenderer;
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
#include "ChunksStorage.hpp"
|
||||
|
||||
#include <content/Content.hpp>
|
||||
#include <debug/Logger.hpp>
|
||||
#include <files/WorldFiles.hpp>
|
||||
#include <items/Inventories.hpp>
|
||||
#include <lighting/Lightmap.hpp>
|
||||
#include <maths/voxmaths.hpp>
|
||||
#include <objects/Entities.hpp>
|
||||
#include <typedefs.hpp>
|
||||
#include <world/Level.hpp>
|
||||
#include <world/World.hpp>
|
||||
#include "content/Content.hpp"
|
||||
#include "debug/Logger.hpp"
|
||||
#include "files/WorldFiles.hpp"
|
||||
#include "items/Inventories.hpp"
|
||||
#include "lighting/Lightmap.hpp"
|
||||
#include "maths/voxmaths.hpp"
|
||||
#include "objects/Entities.hpp"
|
||||
#include "typedefs.hpp"
|
||||
#include "world/Level.hpp"
|
||||
#include "world/World.hpp"
|
||||
#include "Block.hpp"
|
||||
#include "Chunk.hpp"
|
||||
#include "VoxelsVolume.hpp"
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
#include <memory>
|
||||
#include <unordered_map>
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
#include "voxel.hpp"
|
||||
|
||||
#define GLM_ENABLE_EXPERIMENTAL
|
||||
#include "glm/gtx/hash.hpp"
|
||||
#include <glm/gtx/hash.hpp>
|
||||
|
||||
class Chunk;
|
||||
class Level;
|
||||
|
||||
@@ -14,11 +14,11 @@
|
||||
#include <stdexcept>
|
||||
#include <vector>
|
||||
|
||||
#include <content/Content.hpp>
|
||||
#include <core_defs.hpp>
|
||||
#include <maths/FastNoiseLite.h>
|
||||
#include <maths/util.hpp>
|
||||
#include <maths/voxmaths.hpp>
|
||||
#include "content/Content.hpp"
|
||||
#include "core_defs.hpp"
|
||||
#include "maths/FastNoiseLite.h"
|
||||
#include "maths/util.hpp"
|
||||
#include "maths/voxmaths.hpp"
|
||||
|
||||
// will be refactored in generators update
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef VOXELS_DEFAULTWORLDGENERATOR_HPP_
|
||||
#define VOXELS_DEFAULTWORLDGENERATOR_HPP_
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
#include "WorldGenerator.hpp"
|
||||
|
||||
struct voxel;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "FlatWorldGenerator.hpp"
|
||||
|
||||
#include <content/Content.hpp>
|
||||
#include <core_defs.hpp>
|
||||
#include "content/Content.hpp"
|
||||
#include "core_defs.hpp"
|
||||
#include "Chunk.hpp"
|
||||
#include "voxel.hpp"
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef VOXELS_FLATWORLDGENERATOR_HPP_
|
||||
#define VOXELS_FLATWORLDGENERATOR_HPP_
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
#include "WorldGenerator.hpp"
|
||||
|
||||
struct voxel;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#ifndef VOXELS_VOXELSVOLUME_HPP_
|
||||
#define VOXELS_VOXELSVOLUME_HPP_
|
||||
|
||||
#include <constants.hpp>
|
||||
#include <typedefs.hpp>
|
||||
#include "constants.hpp"
|
||||
#include "typedefs.hpp"
|
||||
#include "voxel.hpp"
|
||||
|
||||
class VoxelsVolume {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "WorldGenerator.hpp"
|
||||
|
||||
#include <content/Content.hpp>
|
||||
#include "content/Content.hpp"
|
||||
#include "Block.hpp"
|
||||
#include "Chunk.hpp"
|
||||
#include "voxel.hpp"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
struct voxel;
|
||||
class Content;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef VOXELS_VOXEL_HPP_
|
||||
#define VOXELS_VOXEL_HPP_
|
||||
|
||||
#include <typedefs.hpp>
|
||||
#include "typedefs.hpp"
|
||||
|
||||
inline constexpr int BLOCK_DIR_NORTH = 0x0;
|
||||
inline constexpr int BLOCK_DIR_WEST = 0x1;
|
||||
|
||||
Reference in New Issue
Block a user