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

fog

Browse source
This commit is contained in:
onezplpl 2024-07-15 00:55:34 -04:00
parent 887dfbe5c4
commit 5ff44a7335
No known key found for this signature in database
GPG key ID: 7EC026A136F9EEC3
5 changed files with 115 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

48
cubes.c
View file

@ -14,6 +14,9 @@ struct args {
int a3;
};
Chunk *chunk_old = NULL;
int read_order = 0;
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 ci, int a3) {
VertexI a = {{x, y, z}};
@ -22,8 +25,8 @@ void gen_face(Vertex *cube, int i, int x, int y, int z, int x2, int y2, int z2,
if (is_text) {
a.pos[i]--;
int exists = 0;
exists = (cube_exists(x, y, z, dat, ci) !=
cube_exists(a.pos[0], a.pos[1], a.pos[2], dat, ci));
exists = (cube_exists(x, y, z, dat, ci, read_order) !=
cube_exists(a.pos[0], a.pos[1], a.pos[2], dat, ci, read_order));
a2.pos[0] = exists ? TEXT_GAP_H * i : -1.0;
a2.pos[1] = exists ? TEXT_GAP_V * i : -1.0;
@ -38,6 +41,7 @@ void gen_face(Vertex *cube, int i, int x, int y, int z, int x2, int y2, int z2,
Vertex c = a2;
Vertex d = a2;
if (is_text) {
b.pos[0] += TEXT_GAP_H;
c.pos[1] += TEXT_GAP_V;
@ -74,8 +78,15 @@ void *gen_chunk(void *args) {
Vertex *text = args2.text;
// int is_text = args2.is_text;
int the_j = (((z2 / CHUNK_LENGTH)%a3) + ((x2 / CHUNK_LENGTH)%a3) * CHUNK_DIAMETER_H +
((y2 / CHUNK_LENGTH)%a3) * CHUNK_DIAMETER_H * CHUNK_DIAMETER_H) %
CHUNK_ALL;
Chunk chunk =
fetch_chunk(x2 / CHUNK_LENGTH, y2 / CHUNK_LENGTH, z2 / CHUNK_LENGTH, a);
fetch_chunk(x2 / CHUNK_LENGTH, y2 / CHUNK_LENGTH, z2 / CHUNK_LENGTH, a,
chunk_old[the_j > 0 ? the_j : 0].exists, read_order);
if (chunk.exists != 0 && the_j > 0)
chunk_old[the_j] = chunk;
printf("Loading world... (%i / %i)\n", a2, CHUNK_ALL);
@ -103,7 +114,8 @@ void *gen_chunk(void *args) {
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, int x, int y, int z, int r,
int is_purge) {
Vertex noth = {{-1, -1, -1}};
for (int i = 0; i < CBLOCK_ALL * 18; i++) {
cube[i] = noth;
@ -115,13 +127,24 @@ int gen_cubes(Vertex *cube, Vertex *text, int x, int y, int z, int r, int is_pur
y *= CHUNK_LENGTH;
z *= CHUNK_LENGTH;
int a3 = CHUNK_DIAMETER_H + (r * 2);
int a = 0; //(z % CHUNK_DIAMETER_H) + (x % CHUNK_DIAMETER_H) * CHUNK_DIAMETER_H + (y % CHUNK_DIAMETER_V) * CHUNK_DIAMETER_H * CHUNK_DIAMETER_H;
//a = a % a3;
//if (a < 0) a = -a;
int a =
0; //(z % CHUNK_DIAMETER_H) + (x % CHUNK_DIAMETER_H) * CHUNK_DIAMETER_H +
//(y % CHUNK_DIAMETER_V) * CHUNK_DIAMETER_H * CHUNK_DIAMETER_H;
// a = a % a3;
// if (a < 0) a = -a;
struct args args[a3];
int thread_return[a3];
if (is_purge) {
for (int k = 0; k < a3; k++) {
purge_chunks(k);
}
}
if (!chunk_old) {
chunk_old = calloc(CHUNK_ALL, sizeof(struct Chunk));
}
read_order = !read_order;
pthread_t thread_id[a3];
for (int y2 = y - (CHUNK_RADIUS_V + r) * CHUNK_LENGTH;
y2 <= y + (CHUNK_RADIUS_V + r) * CHUNK_LENGTH; y2 += CHUNK_LENGTH) {
@ -132,7 +155,14 @@ int gen_cubes(Vertex *cube, Vertex *text, int x, int y, int z, int r, int is_pur
for (int z2 = z - (CHUNK_RADIUS_H + r) * CHUNK_LENGTH;
z2 <= z + (CHUNK_RADIUS_H + r) * CHUNK_LENGTH; z2 += CHUNK_LENGTH) {
VertexI pos = {{x2, y2, z2}};
VertexI pos = {
{x + (((x2 / CHUNK_LENGTH) % (CHUNK_DIAMETER_H + r * 2))) *
CHUNK_LENGTH,
y + (((y2 / CHUNK_LENGTH) % (CHUNK_DIAMETER_V + r * 2))) *
CHUNK_LENGTH,
z + (((z2 / CHUNK_LENGTH) % (CHUNK_DIAMETER_H + r * 2))) *
CHUNK_LENGTH}};
int a2 = a % a3;
args[a2].cube = cube;
args[a2].text = text;
@ -144,7 +174,6 @@ int gen_cubes(Vertex *cube, Vertex *text, int x, int y, int z, int r, int is_pur
/*gen_chunk((void *)&args); */
if (is_purge) purge_chunks(a2);
pthread_create(&(thread_id[a2]), NULL, gen_chunk, (void *)&(args[a2]));
i += 6;
@ -155,7 +184,6 @@ int gen_cubes(Vertex *cube, Vertex *text, int x, int y, int z, int r, int is_pur
for (int k = 0; k < a3; k++) {
pthread_join((thread_id[k]), (void **)&thread_return[k]);
}
int max = 0;
int min = 0xFFFFFFF;