summaryrefslogtreecommitdiff
path: root/state_mainstate/src/worldgen.c
diff options
context:
space:
mode:
Diffstat (limited to 'state_mainstate/src/worldgen.c')
-rw-r--r--state_mainstate/src/worldgen.c221
1 files changed, 213 insertions, 8 deletions
diff --git a/state_mainstate/src/worldgen.c b/state_mainstate/src/worldgen.c
index 6e5b9c1..51ed21a 100644
--- a/state_mainstate/src/worldgen.c
+++ b/state_mainstate/src/worldgen.c
@@ -44,28 +44,39 @@ static usize global_idx(ivec3 pos) {
}
// Chunks are laid out in worldspace as [c1, ..., cN]
-static void gen_chunk(u8 *chunk, usize z, usize x) {
+static void gen_chunk(u32 *chunk, usize z, usize x) {
// Flat chunks
for (usize yy = 0; yy < CHUNK_HEIGHT / 4; yy++) {
for (usize zz = 0; zz < CHUNK_LENGTH; zz++) {
for (usize xx = 0; xx < CHUNK_WIDTH; xx++) {
- chunk[yy * CHUNK_LENGTH * CHUNK_WIDTH
- + zz * CHUNK_WIDTH
- + xx] = BLOCK_grass;
+ ivec3 pos = {xx,yy,zz};
+ chunk[global_idx(pos)] = BLOCK_grass;
+ //chunk[yy * CHUNK_LENGTH * CHUNK_WIDTH
+ // + zz * CHUNK_WIDTH
+ // + xx] = BLOCK_grass;
}
}
}
+ for (usize zz = 0; zz < CHUNK_LENGTH; zz++) {
+ for (usize xx = 0; xx < CHUNK_WIDTH; xx++) {
+ if (zz % 2 != 0) continue;
+ if (xx % 2 != 0) continue;
+ chunk[(CHUNK_HEIGHT / 4 + 0) * CHUNK_LENGTH * CHUNK_WIDTH
+ + zz * CHUNK_WIDTH
+ + xx] = BLOCK_rock;
+ }
+ }
}
-void gen_terrain(u8 *world) {
+void gen_terrain(u32 *world) {
if (world == NULL) {
world = calloc(WORLD_SIZE * CHUNK_SIZE, sizeof(u8));
}
- for (usize z = 0; z < WORLD_WIDTH; z++) {
- for (usize x = 0; x < WORLD_LENGTH; x++) {
+ for (usize z = 0; z < WORLD_LENGTH; z++) {
+ for (usize x = 0; x < WORLD_WIDTH; x++) {
gen_chunk(&world[
- z * WORLD_LENGTH * CHUNK_SIZE
+ z * WORLD_WIDTH * CHUNK_SIZE
+ x * CHUNK_SIZE
], z, x);
}
@@ -97,4 +108,198 @@ void gen_terrain(u8 *world) {
world[global_idx(pos)] = BLOCK_none;
pos[1]++;
world[global_idx(pos)] = BLOCK_none;
+
+
+ // Mask everything
+ for (usize z = 0; z < WORLD_LENGTH; z++) {
+ for (usize x = 0; x < WORLD_WIDTH; x++) {
+
+ u32 * restrict chunk = &world[
+ z * WORLD_WIDTH * CHUNK_SIZE
+ + x * CHUNK_SIZE
+ ];
+
+ for (isize yy = 0; yy < CHUNK_HEIGHT; yy++) {
+ for (isize zz = 0; zz < CHUNK_LENGTH; zz++) {
+ for (isize xx = 0; xx < CHUNK_WIDTH; xx++) {
+
+ u32 mask = 0;
+
+ // TODO: Fix OOB access
+ for (int i = 0; i < 3; i++) {
+ for (int j = 0; j < 3; j++) {
+ for (int k = 0; k < 3; k++) {
+ if (i == 0 && yy - 1 < 0) continue;
+ if (j == 0 && zz - 1 < 0) continue;
+ if (k == 0 && xx - 1 < 0) continue;
+ if (i == 2 && yy + 1 >= CHUNK_HEIGHT) continue;
+ if (j == 2 && zz + 1 >= CHUNK_LENGTH) continue;
+ if (k == 2 && xx + 1 >= CHUNK_WIDTH) continue;
+
+ if (
+ chunk[(i + yy - 1) * CHUNK_LENGTH * CHUNK_WIDTH
+ + (j + zz - 1) * CHUNK_WIDTH
+ + (k + xx - 1)] & ((1 << 5) - 1)
+ ) {
+ mask |= 1 << ((i * 9) + j * 3 + k);
+ }
+ }
+ }
+ }
+
+ if (yy == 0) {
+ mask |= FILLED_MASK_BOT;
+ }
+ chunk[yy * CHUNK_LENGTH * CHUNK_WIDTH
+ + zz * CHUNK_WIDTH
+ + xx] |= mask << 5;
+ }
+ }
+ }
+
+ }
+ }
+
+ // Mask chunk borders
+ for (usize z = 0; z < WORLD_LENGTH; z++) {
+ for (usize x = 0; x < WORLD_WIDTH; x++) {
+ u32 * restrict chunk = &world[
+ z * WORLD_WIDTH * CHUNK_SIZE
+ + x * CHUNK_SIZE
+ ];
+
+ // LEFT (-X)
+ if (x > 0) {
+ u32 * restrict lchunk = &world[
+ z * WORLD_WIDTH * CHUNK_SIZE
+ + (x - 1) * CHUNK_SIZE
+ ];
+ // local YZ
+ for (isize ly = 0; ly < CHUNK_HEIGHT; ly++) {
+ for (isize lz = 0; lz < CHUNK_LENGTH; lz++) {
+ u32 mask = 0;
+
+ // neighbouring xy
+ for (isize i = 0; i < 3; i++) {
+ for (isize j = 0; j < 3; j++) {
+ if (i == 0 && ly - 1 < 0) continue;
+ if (j == 0 && lz - 1 < 0) continue;
+ if (i == 2 && ly + 1 >= CHUNK_HEIGHT) continue;
+ if (j == 2 && lz + 1 >= CHUNK_LENGTH) continue;
+
+ ivec3 pos = {CHUNK_WIDTH - 1, i + ly - 1, j + lz - 1};
+ if (lchunk[global_idx(pos)] & (((1 << 5) - 1))) {
+ mask |= 1 << (i * 9 + j * 3);
+ }
+ }
+ }
+ ivec3 pos = {0, ly, lz};
+ chunk[ly * CHUNK_LENGTH * CHUNK_WIDTH
+ + lz * CHUNK_WIDTH
+ + 0] |= mask << 5;
+ }
+ }
+ }
+ // RIGHT (+X)
+ if (x < WORLD_WIDTH - 1) {
+ u32 * restrict rchunk = &world[
+ z * WORLD_WIDTH * CHUNK_SIZE
+ + (x + 1) * CHUNK_SIZE
+ ];
+
+ // local YZ
+ for (isize ly = 0; ly < CHUNK_HEIGHT; ly++) {
+ for (isize lz = 0; lz < CHUNK_LENGTH; lz++) {
+ u32 mask = 0;
+
+ // neighbouring xy
+ for (isize i = 0; i < 3; i++) {
+ for (isize j = 0; j < 3; j++) {
+ if (i == 0 && ly - 1 < 0) continue;
+ if (j == 0 && lz - 1 < 0) continue;
+ if (i == 2 && ly + 1 >= CHUNK_HEIGHT) continue;
+ if (j == 2 && lz + 1 >= CHUNK_LENGTH) continue;
+
+ ivec3 pos = {0, i + ly - 1, j + lz - 1};
+ if (rchunk[global_idx(pos)] & (((1 << 5) - 1))) {
+ mask |= 1 << (i * 9 + j * 3 + 2);
+ }
+ }
+ }
+ ivec3 pos = {CHUNK_WIDTH - 1, ly, lz};
+ chunk[ly * CHUNK_LENGTH * CHUNK_WIDTH
+ + lz * CHUNK_WIDTH
+ + (CHUNK_WIDTH - 1)] |= mask << 5;
+ }
+ }
+ }
+ // BACK (-Z)
+ if (z > 0) {
+ u32 * restrict bchunk = &world[
+ (z - 1) * WORLD_WIDTH * CHUNK_SIZE
+ + x * CHUNK_SIZE
+ ];
+ // local YZ
+ for (isize ly = 0; ly < CHUNK_HEIGHT; ly++) {
+ for (isize lx = 0; lx < CHUNK_LENGTH; lx++) {
+ u32 mask = 0;
+
+ // neighbouring xy
+ for (isize i = 0; i < 3; i++) {
+ for (isize j = 0; j < 3; j++) {
+ if (i == 0 && ly - 1 < 0) continue;
+ if (j == 0 && lx - 1 < 0) continue;
+ if (i == 2 && ly + 1 >= CHUNK_HEIGHT) continue;
+ if (j == 2 && lx + 1 >= CHUNK_WIDTH) continue;
+
+ ivec3 pos = {j + lx - 1, i + ly - 1, CHUNK_LENGTH - 1};
+ if (bchunk[global_idx(pos)] & (((1 << 5) - 1))) {
+ mask |= 1 << (i * 9 + j);
+ }
+ }
+ }
+ ivec3 pos = {lx, ly, 0};
+ chunk[ly * CHUNK_LENGTH * CHUNK_WIDTH
+ + 0
+ + lx] |= mask << 5;
+ }
+ }
+ }
+ // FRONT (+Z)
+ if (z < WORLD_LENGTH - 1) {
+ u32 * restrict rchunk = &world[
+ (z + 1) * WORLD_WIDTH * CHUNK_SIZE
+ + x * CHUNK_SIZE
+ ];
+
+ // local YZ
+ for (isize ly = 0; ly < CHUNK_HEIGHT; ly++) {
+ for (isize lx = 0; lx < CHUNK_WIDTH; lx++) {
+ u32 mask = 0;
+
+ // neighbouring xy
+ for (isize i = 0; i < 3; i++) {
+ for (isize j = 0; j < 3; j++) {
+ if (i == 0 && ly - 1 < 0) continue;
+ if (j == 0 && lx - 1 < 0) continue;
+ if (i == 2 && ly + 1 >= CHUNK_HEIGHT) continue;
+ if (j == 2 && lx + 1 >= CHUNK_WIDTH) continue;
+
+ ivec3 pos = {j + lx - 1, i + ly - 1, 0};
+ if (rchunk[global_idx(pos)] & (((1 << 5) - 1))) {
+ mask |= 1 << (i * 9 + j + 6);
+ }
+ }
+ }
+ ivec3 pos = {lx, ly, CHUNK_LENGTH - 1};
+ chunk[ly * CHUNK_LENGTH * CHUNK_WIDTH
+ + (CHUNK_LENGTH - 1) * CHUNK_WIDTH
+ + lx] |= mask << 5;
+ }
+ }
+ }
+
+
+ }
+ }
}
generated by cgit v1.3 (git 2.53.0) at 2026-05-23 13:17:08 +0000