freya/minecraftvulkan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

variable chunk sizes

Browse source
This commit is contained in:
tylermurphy534 2022-10-01 14:12:54 -04:00
parent 5585b67a27
commit a82704af88
3 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/chunk.cpp
View file

@ -180,9 +180,9 @@ void Chunk::createMesh(Chunk* c) {
const int Axis1 = (Axis + 1) % 3; const int Axis1 = (Axis + 1) % 3;
const int Axis2 = (Axis + 2) % 3; const int Axis2 = (Axis + 2) % 3;
const int MainAxisLimit = Axis == 1 ? 256 : 16; const int MainAxisLimit = CHUNK_SIZE[Axis];
int Axis1Limit = Axis1 == 1 ? 256 : 16; const int Axis1Limit = CHUNK_SIZE[Axis1];
int Axis2Limit = Axis2 == 1 ? 256 : 16; const int Axis2Limit = CHUNK_SIZE[Axis2];
auto DeltaAxis1 = glm::vec3(0.f); auto DeltaAxis1 = glm::vec3(0.f);
auto DeltaAxis2 = glm::vec3(0.f); auto DeltaAxis2 = glm::vec3(0.f);
@ -296,15 +296,15 @@ void Chunk::generateAsync(Chunk* c) {
} }
void Chunk::generate(Chunk* c) { void Chunk::generate(Chunk* c) {
c->cubes.resize(16*16*256); c->cubes.resize(CHUNK_SIZE.x*CHUNK_SIZE.y*CHUNK_SIZE.z);
const PerlinNoise perlin{c->world_seed}; const PerlinNoise perlin{c->world_seed};
for(int x = 0; x < 16; x++) { for(int x = 0; x < CHUNK_SIZE.x; x++) {
for(int z = 0; z < 16; z++) { for(int z = 0; z < CHUNK_SIZE.z; z++) {
double biome = perlin.octave2D_01((( x + c->gridX * 13) * 0.0005), ((z + c->gridZ * 13) * 0.0005), 4) * 2; double biome = perlin.octave2D_01((( x + c->gridX * 13) * 0.0005), ((z + c->gridZ * 13) * 0.0005), 4) * 2;
double continent = perlin.octave2D_01((( x + c->gridX * 16) * 0.001), ((z + c->gridZ * 16) * 0.001), 4) * 10 - 5; double continent = perlin.octave2D_01((( x + c->gridX * CHUNK_SIZE.x) * 0.001), ((z + c->gridZ * CHUNK_SIZE.z) * 0.001), 4) * 10 - 5;
double noise = perlin.octave2D_01((( x + c->gridX * 16) * 0.01), ((z + c->gridZ * 16) * 0.01), 4); double noise = perlin.octave2D_01((( x + c->gridX * CHUNK_SIZE.x) * 0.01), ((z + c->gridZ * CHUNK_SIZE.z) * 0.01), 4);
int height = noise * 40 + continent; int height = noise * 40 + continent;
for(int y = 0; y < std::max(height, WATER_LEVEL); y++) { for(int y = 0; y < std::max(height, WATER_LEVEL); y++) {
int difference = y - WATER_LEVEL; int difference = y - WATER_LEVEL;
@ -353,38 +353,41 @@ xe::Model* Chunk::getMesh() {
} }
uint8_t Chunk::getBlock(int32_t x, int32_t y, int32_t z) { uint8_t Chunk::getBlock(int32_t x, int32_t y, int32_t z) {
if(y >= 256) return AIR; if(y >= CHUNK_SIZE.y) return AIR;
if(y < 0) return INVALID; if(y < 0) return INVALID;
int chunkX = gridX; int chunkX = gridX;
int chunkZ = gridZ; int chunkZ = gridZ;
if(x < 0) { if(x < 0) {
chunkX--; chunkX--;
} else if(x > 15) { } else if(x > CHUNK_SIZE.x-1) {
chunkX++; chunkX++;
} }
if(z < 0) { if(z < 0) {
chunkZ--; chunkZ--;
} else if(z > 15) { } else if(z > CHUNK_SIZE.z-1) {
chunkZ++; chunkZ++;
} }
x = (x+16)%16; x = (x+CHUNK_SIZE.x)%CHUNK_SIZE.x;
z = (z+16)%16; z = (z+CHUNK_SIZE.z)%CHUNK_SIZE.z;
if(chunkX == gridX && chunkZ == gridZ) { if(chunkX == gridX && chunkZ == gridZ) {
int index = x + (z * 16) + (y * 256); int index = x + (y * CHUNK_SIZE.x) + (z * CHUNK_SIZE.x * CHUNK_SIZE.y);
return cubes[index]; return cubes[index];
} else { } else {
Chunk* chunk = getChunk(chunkX, chunkZ); Chunk* chunk = getChunk(chunkX, chunkZ);
if(chunk == NULL) { if(chunk == NULL) {
return INVALID; return INVALID;
} else { } else {
int index = x + (z * 16) + (y * 256); int index = x + (y * CHUNK_SIZE.x) + (z * CHUNK_SIZE.x * CHUNK_SIZE.y);
return chunk->cubes[index]; return chunk->cubes[index];
} }
} }
} }
void Chunk::setBlock(int32_t x, int32_t y, int32_t z, uint8_t block) { void Chunk::setBlock(int32_t x, int32_t y, int32_t z, uint8_t block) {
int index = x + (z * 16) + (y * 256); if(x < 0 || x >= CHUNK_SIZE.x) return;
if(y < 0 || y >= CHUNK_SIZE.y) return;
if(z < 0 || z >= CHUNK_SIZE.z) return;
int index = x + (y * CHUNK_SIZE.x) + (z * CHUNK_SIZE.x * CHUNK_SIZE.y);
cubes[index] = block; cubes[index] = block;
} }

5
src/chunk.hpp
View file

@ -38,8 +38,6 @@
#define SHRUB_TEXTURE "res/image/shrub.png" #define SHRUB_TEXTURE "res/image/shrub.png"
#define SHRUB_TOP_TEXTURE "res/image/shrub_top.png" #define SHRUB_TOP_TEXTURE "res/image/shrub_top.png"
static constexpr int WATER_LEVEL = 20;
namespace app { namespace app {
struct Block { struct Block {
@ -50,6 +48,9 @@ class Chunk {
public: public:
static constexpr int WATER_LEVEL = 20;
static constexpr glm::ivec3 CHUNK_SIZE{32, 256, 32};
static void load(); static void load();
static void unload(); static void unload();
static std::vector<xe::Image*>& getTextures(); static std::vector<xe::Image*>& getTextures();

10
src/first_app.cpp
View file

@ -62,8 +62,8 @@ void FirstApp::createGameObjects(xe::GameObject& viewer) {
} }
void FirstApp::reloadLoadedChunks(xe::GameObject& viewer) { void FirstApp::reloadLoadedChunks(xe::GameObject& viewer) {
viewX = static_cast<int>(floor(viewer.transform.translation.x / 16.f)); viewX = static_cast<int>(floor(viewer.transform.translation.x / Chunk::CHUNK_SIZE.x));
viewZ = static_cast<int>(floor(viewer.transform.translation.z / 16.f)); viewZ = static_cast<int>(floor(viewer.transform.translation.z / Chunk::CHUNK_SIZE.z));
int width = 2*RENDER_DISTANCE+1; int width = 2*RENDER_DISTANCE+1;
int minX = viewX - RENDER_DISTANCE; int minX = viewX - RENDER_DISTANCE;
int minZ = viewZ - RENDER_DISTANCE; int minZ = viewZ - RENDER_DISTANCE;
@ -72,8 +72,8 @@ void FirstApp::reloadLoadedChunks(xe::GameObject& viewer) {
for(int32_t x = 0; x < width; x++) { for(int32_t x = 0; x < width; x++) {
for(int32_t z = 0; z < width; z++) { for(int32_t z = 0; z < width; z++) {
auto& gameObject = loadedChunks[x + z * width]; auto& gameObject = loadedChunks[x + z * width];
int gridX = static_cast<int>(floor(gameObject.transform.translation.x / 16.f)); int gridX = static_cast<int>(floor(gameObject.transform.translation.x / Chunk::CHUNK_SIZE.x));
int gridZ = static_cast<int>(floor(gameObject.transform.translation.z / 16.f)); int gridZ = static_cast<int>(floor(gameObject.transform.translation.z / Chunk::CHUNK_SIZE.z));
int newGridX = minX + x; int newGridX = minX + x;
int newGridZ = minZ + z; int newGridZ = minZ + z;
if(gridX < minX || gridZ < minZ || gridX > maxX || gridZ > maxZ) if(gridX < minX || gridZ < minZ || gridX > maxX || gridZ > maxZ)
@ -87,7 +87,7 @@ void FirstApp::reloadLoadedChunks(xe::GameObject& viewer) {
Chunk::createMeshAsync(chunk); Chunk::createMeshAsync(chunk);
} }
gameObject.model = chunk->getMesh(); gameObject.model = chunk->getMesh();
gameObject.transform.translation = glm::vec3(newGridX * 16.f, 0, newGridZ * 16.f); gameObject.transform.translation = glm::vec3(newGridX * Chunk::CHUNK_SIZE.x, 0, newGridZ * Chunk::CHUNK_SIZE.z);
} }
} }
} }