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

even more optimization

Browse source
This commit is contained in:
onezplpl 2024-07-15 10:14:25 -04:00
parent e66093d684
commit 04a03877a2
No known key found for this signature in database
GPG key ID: 7EC026A136F9EEC3
3 changed files with 109 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

82
cubes.c
View file

@ -1,3 +1,5 @@
// the messiest part of this whole codebase
#include "const.h"
#include "gen.h"
#include <pthread.h>
@ -12,8 +14,13 @@ struct args {
int a;
int i;
int a3;
int *i2;
};
int ox = -1024;
int oy = -1024;
int oz = -1024;
Chunk *chunk_old = NULL;
int read_order = 0;
@ -69,31 +76,36 @@ void *gen_chunk(void *args) {
int a3 = args2.a3;
int a2 = args2.a;
int a = a2 % a3;
int *i2 = args2.i2;
int x2 = args2.pos.pos[0];
int y2 = args2.pos.pos[1];
int z2 = args2.pos.pos[2];
Vertex *cube = args2.cube;
Vertex *text = args2.text;
Vertex vNul = {{-10.0, -10.0, -10.0}};
if (x2 < 0 || y2 < 0 || z2 < 0) {
for (int a = i; a < args2.i + (BLOCK_ALL * 18) * a3; a += 6 * a3) {
cube[a] = vNul;
text[a] = vNul;
}
return 0;
}
// int is_text = args2.is_text;
int the_j = (((z2 / CHUNK_LENGTH) % CHUNK_DIAMETER_H) +
int the_j = a2; /*(((z2 / CHUNK_LENGTH) % CHUNK_DIAMETER_H) +
((x2 / CHUNK_LENGTH) % CHUNK_DIAMETER_H) * CHUNK_DIAMETER_H +
((y2 / CHUNK_LENGTH) % CHUNK_DIAMETER_V) * CHUNK_DIAMETER_H *
CHUNK_DIAMETER_H) %
(CHUNK_ALL * CBUF_ALL);
(CHUNK_ALL);*/
Chunk old_chunk = chunk_old[the_j > 0 ? the_j : 0];
Chunk chunk = fetch_chunk(x2 / CHUNK_LENGTH, y2 / CHUNK_LENGTH,
z2 / CHUNK_LENGTH, a, 0, read_order);
int cached =
(old_chunk.x == x2 / CHUNK_LENGTH && old_chunk.y == y2 / CHUNK_LENGTH &&
old_chunk.z == z2 / CHUNK_LENGTH && old_chunk.exists != 0);
Chunk chunk =
cached ? old_chunk
: fetch_chunk(x2 / CHUNK_LENGTH, y2 / CHUNK_LENGTH,
z2 / CHUNK_LENGTH, a, old_chunk.exists, read_order);
if (chunk.exists != 0 && the_j > 0)
if (chunk.exists != 0 && the_j > -1)
chunk_old[the_j] = chunk;
printf("Loading world... (%i / %i)\n", a2, CHUNK_ALL);
@ -119,11 +131,16 @@ void *gen_chunk(void *args) {
}
}
}
for (int a = i; a < args2.i + (BLOCK_ALL * 18) * a3; a += 6 * a3) {
cube[a] = vNul;
text[a] = vNul;
}
return (void *)i;
}
int gen_cubes(Vertex *cube, Vertex *text, int x, int y, int z, int r,
int is_purge) {
int gen_cubes(Vertex *cube, Vertex *text, Vertex *cubeO, Vertex *textO, int x,
int y, int z, int r, int is_purge, int *i2) {
Vertex noth = {{-1, -1, -1}};
for (int i = 0; i < CBLOCK_ALL * 18; i++) {
cube[i] = noth;
@ -150,10 +167,11 @@ int gen_cubes(Vertex *cube, Vertex *text, int x, int y, int z, int r,
}
if (!chunk_old) {
chunk_old = calloc((CHUNK_ALL * CBUF_ALL), sizeof(struct Chunk));
chunk_old = calloc((CHUNK_ALL), sizeof(struct Chunk));
}
read_order = !read_order;
pthread_t thread_id[a3];
int j = 0;
for (int y2 = y - (CHUNK_RADIUS_V + r) * CHUNK_LENGTH;
y2 <= y + (CHUNK_RADIUS_V + r) * CHUNK_LENGTH; y2 += CHUNK_LENGTH) {
@ -182,10 +200,26 @@ int gen_cubes(Vertex *cube, Vertex *text, int x, int y, int z, int r,
args[a2].a = a;
args[a2].i = i;
args[a2].a3 = a3;
args[a2].i2 = i2;
/*gen_chunk((void *)&args); */
pthread_create(&(thread_id[a2]), NULL, gen_chunk, (void *)&(args[a2]));
Chunk old_chunk = chunk_old[a];
int cached =
(old_chunk.x == pos.pos[0] / CHUNK_LENGTH &&
old_chunk.y == pos.pos[1] / CHUNK_LENGTH &&
old_chunk.z == pos.pos[2] / CHUNK_LENGTH && old_chunk.exists != 0);
if (cached) {
thread_return[a2] = i2[a2 / a3];
thread_id[a2] = -1;
} else if (pos.pos[0] < 0 || pos.pos[1] < 0 || pos.pos[2] < 0 || pos.pos[1] < (y * 0.95)) {
thread_return[a2] = -1;
thread_id[a2] = -1;
} else {
pthread_create(&(thread_id[a2]), NULL, gen_chunk,
(void *)&(args[a2]));
}
i += 6;
@ -193,6 +227,8 @@ int gen_cubes(Vertex *cube, Vertex *text, int x, int y, int z, int r,
}
for (int k = 0; k < a3; k++) {
if (thread_id[k] == -1)
continue;
pthread_join((thread_id[k]), (void **)&thread_return[k]);
}
int max = 0;
@ -202,10 +238,20 @@ int gen_cubes(Vertex *cube, Vertex *text, int x, int y, int z, int r,
max = (max > thread_return[a]) ? max : thread_return[a];
min = (min < thread_return[a]) ? min : thread_return[a];
}
i = max + 6;
max += 6;
i2[(a / a3) - 1] = max;
if (max > i) {
memcpy(&(cubeO[j]), &(cube[i - 6 * a3]), (max - i) * sizeof(Vertex));
memcpy(&(textO[j]), &(text[i - 6 * a3]), (max - i) * sizeof(Vertex));
j += max - i;
}
i = (BLOCK_ALL * 18) * a; // i = max + 6;
}
}
ox = x;
oy = y;
oz = z;
/* if (i < CBLOCK_ALL * 9 && r < MAX_R) {
printf("Expanding radius...\n");
return gen_cubes(cube, text, x / CHUNK_LENGTH, y / CHUNK_LENGTH,
@ -213,5 +259,5 @@ int gen_cubes(Vertex *cube, Vertex *text, int x, int y, int z, int r,
}
*/
return i;
return j; // i;
}