the final rename
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
#include "Block.h"
|
||||
#include "Block.hpp"
|
||||
|
||||
#include "../core_defs.hpp"
|
||||
#include "../util/stringutil.hpp"
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
#ifndef VOXELS_BLOCK_H_
|
||||
#define VOXELS_BLOCK_H_
|
||||
#ifndef VOXELS_BLOCK_HPP_
|
||||
#define VOXELS_BLOCK_HPP_
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <glm/glm.hpp>
|
||||
|
||||
#include "../maths/aabb.h"
|
||||
#include "../maths/aabb.hpp"
|
||||
#include "../maths/UVRegion.hpp"
|
||||
#include "../typedefs.h"
|
||||
#include "../typedefs.hpp"
|
||||
|
||||
#define BLOCK_ITEM_SUFFIX ".item"
|
||||
|
||||
@@ -188,4 +188,4 @@ public:
|
||||
Block(const Block&) = delete;
|
||||
};
|
||||
|
||||
#endif /* VOXELS_BLOCK_H_ */
|
||||
#endif /* VOXELS_BLOCK_HPP_ */
|
||||
@@ -1,10 +1,10 @@
|
||||
#include "Chunk.h"
|
||||
#include "Chunk.hpp"
|
||||
|
||||
#include "voxel.h"
|
||||
#include "voxel.hpp"
|
||||
|
||||
#include "../items/Inventory.h"
|
||||
#include "../items/Inventory.hpp"
|
||||
#include "../content/ContentLUT.hpp"
|
||||
#include "../lighting/Lightmap.h"
|
||||
#include "../lighting/Lightmap.hpp"
|
||||
|
||||
Chunk::Chunk(int xpos, int zpos) : x(xpos), z(zpos){
|
||||
bottom = 0;
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
#ifndef VOXELS_CHUNK_H_
|
||||
#define VOXELS_CHUNK_H_
|
||||
#ifndef VOXELS_CHUNK_HPP_
|
||||
#define VOXELS_CHUNK_HPP_
|
||||
|
||||
#include <memory>
|
||||
#include <stdlib.h>
|
||||
#include <unordered_map>
|
||||
|
||||
#include "../constants.h"
|
||||
#include "voxel.h"
|
||||
#include "../lighting/Lightmap.h"
|
||||
#include "../constants.hpp"
|
||||
#include "voxel.hpp"
|
||||
#include "../lighting/Lightmap.hpp"
|
||||
|
||||
struct ChunkFlag {
|
||||
static const int MODIFIED = 0x1;
|
||||
@@ -97,4 +97,4 @@ public:
|
||||
static void convert(ubyte* data, const ContentLUT* lut);
|
||||
};
|
||||
|
||||
#endif /* VOXELS_CHUNK_H_ */
|
||||
#endif /* VOXELS_CHUNK_HPP_ */
|
||||
+12
-12
@@ -1,16 +1,16 @@
|
||||
#include "Chunks.h"
|
||||
#include "Chunk.h"
|
||||
#include "voxel.h"
|
||||
#include "Block.h"
|
||||
#include "WorldGenerator.h"
|
||||
#include "../content/Content.h"
|
||||
#include "../lighting/Lightmap.h"
|
||||
#include "../files/WorldFiles.h"
|
||||
#include "../world/LevelEvents.h"
|
||||
#include "Chunks.hpp"
|
||||
#include "Chunk.hpp"
|
||||
#include "voxel.hpp"
|
||||
#include "Block.hpp"
|
||||
#include "WorldGenerator.hpp"
|
||||
#include "../content/Content.hpp"
|
||||
#include "../lighting/Lightmap.hpp"
|
||||
#include "../files/WorldFiles.hpp"
|
||||
#include "../world/LevelEvents.hpp"
|
||||
#include "../graphics/core/Mesh.hpp"
|
||||
#include "../maths/voxmaths.h"
|
||||
#include "../maths/aabb.h"
|
||||
#include "../maths/rays.h"
|
||||
#include "../maths/voxmaths.hpp"
|
||||
#include "../maths/aabb.hpp"
|
||||
#include "../maths/rays.hpp"
|
||||
|
||||
#include <math.h>
|
||||
#include <limits.h>
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
#ifndef VOXELS_CHUNKS_H_
|
||||
#define VOXELS_CHUNKS_H_
|
||||
#ifndef VOXELS_CHUNKS_HPP_
|
||||
#define VOXELS_CHUNKS_HPP_
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <vector>
|
||||
#include <memory>
|
||||
#include <glm/glm.hpp>
|
||||
#include "../typedefs.h"
|
||||
#include "../typedefs.hpp"
|
||||
|
||||
class VoxelRenderer;
|
||||
|
||||
@@ -68,4 +68,4 @@ public:
|
||||
void saveAndClear();
|
||||
};
|
||||
|
||||
#endif /* VOXELS_CHUNKS_H_ */
|
||||
#endif /* VOXELS_CHUNKS_HPP_ */
|
||||
@@ -1,19 +1,19 @@
|
||||
#include "ChunksStorage.h"
|
||||
#include "ChunksStorage.hpp"
|
||||
|
||||
#include <assert.h>
|
||||
#include <iostream>
|
||||
|
||||
#include "VoxelsVolume.h"
|
||||
#include "Chunk.h"
|
||||
#include "Block.h"
|
||||
#include "../content/Content.h"
|
||||
#include "../files/WorldFiles.h"
|
||||
#include "../world/Level.h"
|
||||
#include "../world/World.h"
|
||||
#include "../maths/voxmaths.h"
|
||||
#include "../lighting/Lightmap.h"
|
||||
#include "../items/Inventories.h"
|
||||
#include "../typedefs.h"
|
||||
#include "VoxelsVolume.hpp"
|
||||
#include "Chunk.hpp"
|
||||
#include "Block.hpp"
|
||||
#include "../content/Content.hpp"
|
||||
#include "../files/WorldFiles.hpp"
|
||||
#include "../world/Level.hpp"
|
||||
#include "../world/World.hpp"
|
||||
#include "../maths/voxmaths.hpp"
|
||||
#include "../lighting/Lightmap.hpp"
|
||||
#include "../items/Inventories.hpp"
|
||||
#include "../typedefs.hpp"
|
||||
|
||||
ChunksStorage::ChunksStorage(Level* level) : level(level) {
|
||||
}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
#ifndef VOXELS_CHUNKSSTORAGE_H_
|
||||
#define VOXELS_CHUNKSSTORAGE_H_
|
||||
#ifndef VOXELS_CHUNKSSTORAGE_HPP_
|
||||
#define VOXELS_CHUNKSSTORAGE_HPP_
|
||||
|
||||
#include <memory>
|
||||
#include <unordered_map>
|
||||
#include "voxel.h"
|
||||
#include "../typedefs.h"
|
||||
#include "voxel.hpp"
|
||||
#include "../typedefs.hpp"
|
||||
|
||||
#define GLM_ENABLE_EXPERIMENTAL
|
||||
#include "glm/gtx/hash.hpp"
|
||||
@@ -30,4 +30,4 @@ public:
|
||||
};
|
||||
|
||||
|
||||
#endif // VOXELS_CHUNKSSTORAGE_H_
|
||||
#endif // VOXELS_CHUNKSSTORAGE_HPP_
|
||||
@@ -1,14 +1,14 @@
|
||||
#include "DefaultWorldGenerator.h"
|
||||
#include "voxel.h"
|
||||
#include "Chunk.h"
|
||||
#include "Block.h"
|
||||
#include "DefaultWorldGenerator.hpp"
|
||||
#include "voxel.hpp"
|
||||
#include "Chunk.hpp"
|
||||
#include "Block.hpp"
|
||||
|
||||
#define FNL_IMPL
|
||||
#include "../maths/FastNoiseLite.h"
|
||||
|
||||
#include "../content/Content.h"
|
||||
#include "../maths/voxmaths.h"
|
||||
#include "../maths/util.h"
|
||||
#include "../content/Content.hpp"
|
||||
#include "../maths/voxmaths.hpp"
|
||||
#include "../maths/util.hpp"
|
||||
#include "../core_defs.hpp"
|
||||
|
||||
#include <iostream>
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#ifndef VOXELS_DEFAULTWORLDGENERATOR_H_
|
||||
#define VOXELS_DEFAULTWORLDGENERATOR_H_
|
||||
#ifndef VOXELS_DEFAULTWORLDGENERATOR_HPP_
|
||||
#define VOXELS_DEFAULTWORLDGENERATOR_HPP_
|
||||
|
||||
#include "../typedefs.h"
|
||||
#include "../voxels/WorldGenerator.h"
|
||||
#include "../typedefs.hpp"
|
||||
#include "../voxels/WorldGenerator.hpp"
|
||||
|
||||
struct voxel;
|
||||
class Content;
|
||||
@@ -15,4 +15,4 @@ public:
|
||||
void generate(voxel* voxels, int x, int z, int seed);
|
||||
};
|
||||
|
||||
#endif /* VOXELS_DEFAULTWORLDGENERATOR_H_ */
|
||||
#endif /* VOXELS_DEFAULTWORLDGENERATOR_HPP_ */
|
||||
@@ -1,8 +1,8 @@
|
||||
#include "FlatWorldGenerator.h"
|
||||
#include "voxel.h"
|
||||
#include "Chunk.h"
|
||||
#include "FlatWorldGenerator.hpp"
|
||||
#include "voxel.hpp"
|
||||
#include "Chunk.hpp"
|
||||
|
||||
#include "../content/Content.h"
|
||||
#include "../content/Content.hpp"
|
||||
#include "../core_defs.hpp"
|
||||
|
||||
void FlatWorldGenerator::generate(voxel* voxels, int cx, int cz, int seed) {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#ifndef VOXELS_FLATWORLDGENERATOR_H_
|
||||
#define VOXELS_FLATWORLDGENERATOR_H_
|
||||
#ifndef VOXELS_FLATWORLDGENERATOR_HPP_
|
||||
#define VOXELS_FLATWORLDGENERATOR_HPP_
|
||||
|
||||
#include "../typedefs.h"
|
||||
#include "../voxels/WorldGenerator.h"
|
||||
#include "../typedefs.hpp"
|
||||
#include "../voxels/WorldGenerator.hpp"
|
||||
|
||||
struct voxel;
|
||||
class Content;
|
||||
@@ -15,4 +15,4 @@ public:
|
||||
void generate(voxel* voxels, int x, int z, int seed);
|
||||
};
|
||||
|
||||
#endif /* VOXELS_FLATWORLDGENERATOR_H_ */
|
||||
#endif /* VOXELS_FLATWORLDGENERATOR_HPP_ */
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "VoxelsVolume.h"
|
||||
#include "VoxelsVolume.hpp"
|
||||
|
||||
VoxelsVolume::VoxelsVolume(int x, int y, int z, int w, int h, int d)
|
||||
: x(x), y(y), z(z), w(w), h(h), d(d) {
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#ifndef VOXELS_VOXELSVOLUME_H_
|
||||
#define VOXELS_VOXELSVOLUME_H_
|
||||
#ifndef VOXELS_VOXELSVOLUME_HPP_
|
||||
#define VOXELS_VOXELSVOLUME_HPP_
|
||||
|
||||
#include "../typedefs.h"
|
||||
#include "../constants.h"
|
||||
#include "voxel.h"
|
||||
#include "../typedefs.hpp"
|
||||
#include "../constants.hpp"
|
||||
#include "voxel.hpp"
|
||||
|
||||
class VoxelsVolume {
|
||||
int x, y, z;
|
||||
@@ -64,4 +64,4 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
#endif // VOXELS_VOXELSVOLUME_H_
|
||||
#endif // VOXELS_VOXELSVOLUME_HPP_
|
||||
@@ -1,9 +1,9 @@
|
||||
#include "WorldGenerator.h"
|
||||
#include "voxel.h"
|
||||
#include "Chunk.h"
|
||||
#include "Block.h"
|
||||
#include "WorldGenerator.hpp"
|
||||
#include "voxel.hpp"
|
||||
#include "Chunk.hpp"
|
||||
#include "Block.hpp"
|
||||
|
||||
#include "../content/Content.h"
|
||||
#include "../content/Content.hpp"
|
||||
|
||||
WorldGenerator::WorldGenerator(const Content* content)
|
||||
: idStone(content->requireBlock("base:stone").rt.id),
|
||||
@@ -15,4 +15,4 @@ WorldGenerator::WorldGenerator(const Content* content)
|
||||
idLeaves(content->requireBlock("base:leaves").rt.id),
|
||||
idGrass(content->requireBlock("base:grass").rt.id),
|
||||
idFlower(content->requireBlock("base:flower").rt.id),
|
||||
idBazalt(content->requireBlock("base:bazalt").rt.id) {}
|
||||
idBazalt(content->requireBlock("base:bazalt").rt.id) {}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef VOXELS_WORLDGENERATOR_H_
|
||||
#define VOXELS_WORLDGENERATOR_H_
|
||||
#ifndef VOXELS_WORLDGENERATOR_HPP_
|
||||
#define VOXELS_WORLDGENERATOR_HPP_
|
||||
|
||||
#include "../typedefs.h"
|
||||
#include "../typedefs.hpp"
|
||||
#include <string>
|
||||
|
||||
struct voxel;
|
||||
@@ -26,4 +26,4 @@ public:
|
||||
virtual void generate(voxel* voxels, int x, int z, int seed) = 0;
|
||||
};
|
||||
|
||||
#endif /* VOXELS_WORLDGENERATOR_H_ */
|
||||
#endif /* VOXELS_WORLDGENERATOR_HPP_ */
|
||||
@@ -1,2 +1,2 @@
|
||||
#include "voxel.h"
|
||||
#include "voxel.hpp"
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef VOXELS_VOXEL_H_
|
||||
#define VOXELS_VOXEL_H_
|
||||
#ifndef VOXELS_VOXEL_HPP_
|
||||
#define VOXELS_VOXEL_HPP_
|
||||
|
||||
#include "../typedefs.h"
|
||||
#include "../typedefs.hpp"
|
||||
|
||||
const int BLOCK_DIR_NORTH = 0x0;
|
||||
const int BLOCK_DIR_WEST = 0x1;
|
||||
@@ -28,4 +28,4 @@ struct voxel {
|
||||
}
|
||||
};
|
||||
|
||||
#endif /* VOXELS_VOXEL_H_ */
|
||||
#endif /* VOXELS_VOXEL_HPP_ */
|
||||
Reference in New Issue
Block a user