EXTERNAL/bareiron
1
0
Fork 1
mirror of https://github.com/p2r3/bareiron.git synced 2025-10-02 07:35:08 +02:00
Code Issues Activity

optimize worldgen

Browse Source
This commit is contained in:
p2r3
2025-08-12 05:16:23 +03:00
parent ae4290e73e
commit 99dc29df22
1 changed files with 16 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/worldgen.c
View File

@@ -58,20 +58,12 @@ int interpolate (int a, int b, int c, int d, int x, int z) {
return (top * (chunk_size - z) + bottom * z) / (chunk_size * chunk_size); return (top * (chunk_size - z) + bottom * z) / (chunk_size * chunk_size);
} }
int getHeightAt (int x, int z, uint32_t chunk_hash) { int getHeightAt (int rx, int rz, int _x, int _z, uint32_t chunk_hash) {
int _x = x / chunk_size;
int _z = z / chunk_size;
int rx = x % chunk_size;
int rz = z % chunk_size;
if (rx < 0) { rx += chunk_size; _x -= 1; }
if (rz < 0) { rz += chunk_size; _z -= 1; }
if (rx == 0 && rz == 0) { if (rx == 0 && rz == 0) {
int height = getCornerHeight(chunk_hash); int height = getCornerHeight(chunk_hash);
if (height > 67) return height - 1; if (height > 67) return height - 1;
} else { }
return interpolate( return interpolate(
getCornerHeight(chunk_hash), getCornerHeight(chunk_hash),
getCornerHeight(getChunkHash(_x + 1, _z)), getCornerHeight(getChunkHash(_x + 1, _z)),
@@ -79,7 +71,6 @@ int getHeightAt (int x, int z, uint32_t chunk_hash) {
getCornerHeight(getChunkHash(_x + 1, _z + 1)), getCornerHeight(getChunkHash(_x + 1, _z + 1)),
rx, rz rx, rz
); );
}
} }
@@ -95,26 +86,11 @@ uint8_t getBlockAt (int x, int y, int z) {
int rx = x % chunk_size; int rx = x % chunk_size;
int rz = z % chunk_size; int rz = z % chunk_size;
int height;
// make remainders positive and move the cell index when negative
if (rx < 0) { rx += chunk_size; _x -= 1; } if (rx < 0) { rx += chunk_size; _x -= 1; }
if (rz < 0) { rz += chunk_size; _z -= 1; } if (rz < 0) { rz += chunk_size; _z -= 1; }
uint32_t chunk_hash = getChunkHash(_x, _z); uint32_t chunk_hash = getChunkHash(_x, _z);
int height = getHeightAt(rx, rz, _x, _z, chunk_hash);
if (rx == 0 && rz == 0) {
height = getCornerHeight(chunk_hash);
if (height > 67) height -= 1;
} else {
height = interpolate(
getCornerHeight(chunk_hash),
getCornerHeight(getChunkHash(_x + 1, _z)),
getCornerHeight(getChunkHash(_x, _z + 1)),
getCornerHeight(getChunkHash(_x + 1, _z + 1)),
rx, rz
);
}
if (y >= 64 && y > height) { if (y >= 64 && y > height) {
@@ -128,7 +104,11 @@ uint8_t getBlockAt (int x, int y, int z) {
if (tree_z < 3 || tree_z > chunk_size - 3) goto skip_tree; if (tree_z < 3 || tree_z > chunk_size - 3) goto skip_tree;
tree_z += _z * chunk_size; tree_z += _z * chunk_size;
uint8_t tree_y = getHeightAt(tree_x, tree_z, chunk_hash) + 1; uint8_t tree_y = getHeightAt(
tree_x < 0 ? tree_x % chunk_size + chunk_size : tree_x % chunk_size,
tree_z < 0 ? tree_z % chunk_size + chunk_size : tree_z % chunk_size,
_x, _z, chunk_hash
) + 1;
if (tree_y < 64) goto skip_tree; if (tree_y < 64) goto skip_tree;
if (x == tree_x && z == tree_z && y >= tree_y && y < tree_y + 6) if (x == tree_x && z == tree_z && y >= tree_y && y < tree_y + 6)
@@ -146,6 +126,8 @@ uint8_t getBlockAt (int x, int y, int z) {
return B_oak_leaves; return B_oak_leaves;
} }
return B_air;
} }
skip_tree: skip_tree: