AstralTransRocketries/cubiomes
1
0
Fork 0
mirror of https://github.com/Cubitect/cubiomes.git synced 2025-09-24 12:14:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Performance improvements for 1.15+ voronoi zoom.

Browse Source
This commit is contained in:
Cubitect 2021-03-07 21:11:39 +01:00
parent 3c806da958
commit 6f2210094f
2 changed files with 103 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,6 +1,6 @@
# cubiomes
Cubiomes is a standalone library, written in C, that mimics the Minecraft Java Edition biome and feature generation.
Cubiomes is a standalone library, written in C, that mimics the biome and feature generation of Minecraft Java Edition.
It is intended as a powerful tool to devise very fast, custom seed finding applications and large scale map viewers with minimal memory usage.

132
layers.c
View File

@ -2017,39 +2017,20 @@ int mapVoronoiZoom(const Layer * l, int * out, int x, int z, int w, int h)
int *buf = (int *) malloc(w*h*sizeof(*buf));
int i, j;
for (j = 0; j < h; j++)
{
for (i = 0; i < w; i++)
{
// TODO: this can be optimized further!
// rx,ry,rz only need to be calculated for the parent grid
// the dependency on the inner grid comes with dx,dz
typedef struct Touple { int x, y, z; } Touple;
Touple *prbuf = (Touple *) malloc(2 * pW * pH * sizeof(Touple));
int pi = x+i;
int pj = z+j;
int px = pi >> 2;
int pz = pj >> 2;
int dx = (pi & 3) * 10240;
int dz = (pj & 3) * 10240;
uint64_t dmin = (uint64_t)-1;
int k;
for (k = 0; k < 8; k++)
for (j = 0; j < pH; j++)
{
for (i = 0; i < pW; i++)
{
int bx = (k & 4) != 0;
int by = (k & 2) != 0;
int bz = (k & 1) != 0;
int ax = px + bx;
int ay = -1 + by;
int az = pz + bz;
int64_t s = sha;
s = mcStepSeed(s, ax);
s = mcStepSeed(s, ay);
s = mcStepSeed(s, az);
s = mcStepSeed(s, ax);
s = mcStepSeed(s, ay);
s = mcStepSeed(s, az);
s = mcStepSeed(s, pX+i);
s = mcStepSeed(s, -1);
s = mcStepSeed(s, pZ+j);
s = mcStepSeed(s, pX+i);
s = mcStepSeed(s, -1);
s = mcStepSeed(s, pZ+j);
int rx = (((s >> 24) & 1023) - 512) * 36;
s = mcStepSeed(s, sha);
@ -2057,31 +2038,104 @@ int mapVoronoiZoom(const Layer * l, int * out, int x, int z, int w, int h)
s = mcStepSeed(s, sha);
int rz = (((s >> 24) & 1023) - 512) * 36;
int64_t sx = rx - 40*1024*bx + dx;
int64_t sy = ry - 40*1024*by + 20*1024;
int64_t sz = rz - 40*1024*bz + dz;
Touple *pt = prbuf + 2*(j*pW+i);
pt->x = rx;
pt->y = ry;
pt->z = rz;
s = sha;
s = mcStepSeed(s, pX+i);
s = mcStepSeed(s, 0);
s = mcStepSeed(s, pZ+j);
s = mcStepSeed(s, pX+i);
s = mcStepSeed(s, 0);
s = mcStepSeed(s, pZ+j);
rx = (((s >> 24) & 1023) - 512) * 36;
s = mcStepSeed(s, sha);
ry = (((s >> 24) & 1023) - 512) * 36;
s = mcStepSeed(s, sha);
rz = (((s >> 24) & 1023) - 512) * 36;
pt++;
pt->x = rx;
pt->y = ry;
pt->z = rz;
}
}
for (j = 0; j < h; j++)
{
for (i = 0; i < w; i++)
{
int xi = x+i;
int zj = z+j;
int pi = (xi >> 2) - pX;
int pj = (zj >> 2) - pZ;
int v00 = out[(pj+0)*pW + (pi+0)];
int v01 = out[(pj+0)*pW + (pi+1)];
int v10 = out[(pj+1)*pW + (pi+0)];
int v11 = out[(pj+1)*pW + (pi+1)];
int v = v00;
if (v00 == v01 && v00 == v10 && v00 == v11)
{
buf[j*w + i] = v00;
continue;
}
int dx = (xi & 3) * 10240;
int dz = (zj & 3) * 10240;
uint64_t dmin = (uint64_t)-1;
int bx, bz;
for (bz = 0; bz <= 1; bz++)
{
for (bx = 0; bx <= 1; bx++)
{
int ax = pi + bx;
int az = pj + bz;
int64_t r;
uint64_t d;
Touple *pt = prbuf + 2*( (az)*pW + (ax) );
d = 0;
r = pt->x - 40*1024*bx + dx; d += r*r;
r = pt->y + 20*1024; d += r*r;
r = pt->z - 40*1024*bz + dz; d += r*r;
uint64_t d = sx*sx + sy*sy + sz*sz;
if (d < dmin)
{
dmin = d;
pi = ax;
pj = az;
v = out[az*pW + ax];
}
pt++;
d = 0;
r = pt->x - 40*1024*bx + dx; d += r*r;
r = pt->y - 20*1024; d += r*r;
r = pt->z - 40*1024*bz + dz; d += r*r;
if (d < dmin)
{
dmin = d;
v = out[az*pW + ax];
}
}
}
pi -= pX;
pj -= pZ;
int v = out[pj*pW + pi];
buf[j*w + i] = v;
}
}
free(prbuf);
memcpy(out, buf, w*h*sizeof(*buf));
free(buf);
return 0;
}
int mapVoronoiZoom114(const Layer * l, int * out, int x, int z, int w, int h)
{
x -= 2;