games/voxel-test
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

multi-threaded chunk loading

Browse source
This commit is contained in:
onezplpl 2024-07-13 17:02:49 -04:00
parent 186ea5f204
commit 7b9de49502
No known key found for this signature in database
GPG key ID: 7EC026A136F9EEC3
4 changed files with 73 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

65
cubes.c
View file

@ -12,15 +12,15 @@ struct args {
};
void gen_face(Vertex *cube, int i, int x, int y, int z, int x2, int y2, int z2,
int j, int is_text, Chunk dat) {
int j, int is_text, Chunk dat, int ci) {
VertexI a = {{x, y, z}};
Vertex a2 = {{x, y, z}};
if (is_text) {
a.pos[i]--;
int exists = 0;
exists = (cube_exists(x, y, z, dat) !=
cube_exists(a.pos[0], a.pos[1], a.pos[2], dat));
exists = (cube_exists(x, y, z, dat, ci) !=
cube_exists(a.pos[0], a.pos[1], a.pos[2], dat, ci));
a2.pos[0] = exists ? TEXT_GAP_H * i : -1.0;
a2.pos[1] = exists ? TEXT_GAP_V * i : -1.0;
@ -55,17 +55,21 @@ void *gen_chunk(void *args) {
struct args args2 = ((struct args *)args)[0];
int i = args2.i;
int a = args2.a % CHUNK_DIAMETER_H;
int a2 = args2.a;
int x2 = args2.pos.pos[0];
int y2 = args2.pos.pos[1];
int z2 = args2.pos.pos[2];
Vertex *cube = args2.cube;
int is_text = args2.is_text;
Chunk chunk =
fetch_chunk(x2 / CHUNK_LENGTH, y2 / CHUNK_LENGTH, z2 / CHUNK_LENGTH);
printf("progress on this thread (%i / %i)\n", args2.a, CHUNK_ALL);
purge_chunks(a % CHUNK_DIAMETER_H);
Chunk chunk = fetch_chunk(x2 / CHUNK_LENGTH, y2 / CHUNK_LENGTH,
z2 / CHUNK_LENGTH, a);
printf("progress on this thread (%i / %i)\n", a2, CHUNK_ALL);
purge_chunks();
for (int y4 = 0; y4 < CHUNK_LENGTH; y4++) {
for (int x4 = 0; x4 < CHUNK_LENGTH; x4++) {
@ -75,9 +79,9 @@ void *gen_chunk(void *args) {
int x3 = x2 + x4;
int z3 = z2 + z4;
gen_face(cube, 0, x3, y3, z3, x4, y4, z4, i, is_text, chunk);
gen_face(cube, 1, x3, y3, z3, x4, y4, z4, i + 6, is_text, chunk);
gen_face(cube, 2, x3, y3, z3, x4, y4, z4, i + 12, is_text, chunk);
gen_face(cube, 0, x3, y3, z3, x4, y4, z4, i, is_text, chunk, a );
gen_face(cube, 1, x3, y3, z3, x4, y4, z4, i + 6, is_text, chunk, a );
gen_face(cube, 2, x3, y3, z3, x4, y4, z4, i + 12, is_text, chunk, a);
i += 18;
}
}
@ -92,38 +96,39 @@ void gen_cubes(Vertex *cube, int x, int y, int z, int is_text) {
y *= CHUNK_LENGTH;
z *= CHUNK_LENGTH;
pthread_t thread_id[24];
for (int y2 = y - CHUNK_RADIUS_H * CHUNK_LENGTH;
y2 <= y + CHUNK_RADIUS_H * CHUNK_LENGTH; y2 += CHUNK_LENGTH) {
struct args args[CHUNK_DIAMETER_H];
pthread_t thread_id[CHUNK_DIAMETER_H];
for (int y2 = y - CHUNK_RADIUS_V * CHUNK_LENGTH;
y2 <= y + CHUNK_RADIUS_V * CHUNK_LENGTH; y2 += CHUNK_LENGTH) {
for (int x2 = x - CHUNK_RADIUS_H * CHUNK_LENGTH;
x2 <= x + CHUNK_RADIUS_H * CHUNK_LENGTH; x2 += CHUNK_LENGTH) {
for (int z2 = z - CHUNK_RADIUS_V * CHUNK_LENGTH;
z2 <= z + CHUNK_RADIUS_V * CHUNK_LENGTH; z2 += CHUNK_LENGTH) {
for (int z2 = z - CHUNK_RADIUS_H * CHUNK_LENGTH;
z2 <= z + CHUNK_RADIUS_H * CHUNK_LENGTH; z2 += CHUNK_LENGTH) {
VertexI pos = {{x2, y2, z2}};
struct args args = {cube, pos, is_text, a, i};
int a2 = a % CHUNK_DIAMETER_H;
args[a2].cube = cube;
args[a2].pos = pos;
args[a2].is_text = is_text;
args[a2].a = a;
args[a2].i = i;
gen_chunk((void *)&args);
/*gen_chunk((void *)&args); */
pthread_create(&(thread_id[a2]), NULL, gen_chunk,
(void *)&(args[a2]));
i += CHUNK_LENGTH * CHUNK_LENGTH * CHUNK_LENGTH * 18;
/* buggy
pthread_create(&(thread_id[i]), NULL, gen_chunk, (void *)&args);
if (i == 23) {
for (int k = 0; k < 24; k++) {
pthread_join((thread_id[k]), NULL);
}
i = 0;
} else {
i++;
}
*/
a++;
}
for (int k = 0; k < CHUNK_DIAMETER_H; k++) {
pthread_join((thread_id[k]), NULL);
}
}
}
}