AstralTransRocketries/cubiomes
1
0
Fork 0
mirror of https://github.com/Cubitect/cubiomes.git synced 2025-09-23 11:45:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Removed dynamic allocations from layer functions

Browse Source 
smaller memory footprint and better cache usage
This commit is contained in:
Cubitect 2021-09-04 10:35:09 +02:00
parent b94c12e982
commit cf14767ca3
5 changed files with 131 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
finders.c
View File

@ -1745,7 +1745,7 @@ int isViableStructurePos(int structureType, int mc, LayerStack *g,
L_feature: L_feature:
if (mc < MC_1_16) if (mc < MC_1_16)
{ {
l = &g->layers[L_VORONOI_ZOOM_1]; l = &g->layers[L_VORONOI_1];
biomeX = (chunkX << 4) + 9; biomeX = (chunkX << 4) + 9;
biomeZ = (chunkZ << 4) + 9; biomeZ = (chunkZ << 4) + 9;
} }
@ -1787,7 +1787,7 @@ L_feature:
goto L_not_viable; goto L_not_viable;
if (mc < MC_1_16) if (mc < MC_1_16)
{ {
l = &g->layers[L_VORONOI_ZOOM_1]; l = &g->layers[L_VORONOI_1];
biomeX = (chunkX << 4) + 9; biomeX = (chunkX << 4) + 9;
biomeZ = (chunkZ << 4) + 9; biomeZ = (chunkZ << 4) + 9;
} }
@ -1852,7 +1852,7 @@ L_feature:
if (!isDeepOcean(ids[0])) if (!isDeepOcean(ids[0]))
goto L_not_viable; goto L_not_viable;
if (mc >= MC_1_13) if (mc >= MC_1_13)
l = &g->layers[L13_OCEAN_MIX_4]; l = &g->layers[L_OCEAN_MIX_4];
else else
l = &g->layers[L_RIVER_MIX_4]; l = &g->layers[L_RIVER_MIX_4];
biomeX = (chunkX << 4) + 8; // areBiomesViable expects block positions biomeX = (chunkX << 4) + 8; // areBiomesViable expects block positions

44
generator.c
View File

@ -224,7 +224,7 @@ void setupGeneratorLargeBiomes(LayerStack *g, int mc, int largeBiomes)
if (mc <= MC_1_12) if (mc <= MC_1_12)
{ {
p = setupLayer(g, L_VORONOI_1, mapVoronoi114, mc, 4, 7, 10, p, 0); p = setupLayer(g, L_VORONOI_1, mapVoronoi114, mc, 4, 3, 10, p, 0);
} }
else else
{ {
@ -241,9 +241,9 @@ void setupGeneratorLargeBiomes(LayerStack *g, int mc, int largeBiomes)
g->layers+L_RIVER_MIX_4, g->layers+L_ZOOM_4_OCEAN); g->layers+L_RIVER_MIX_4, g->layers+L_ZOOM_4_OCEAN);
if (mc <= MC_1_14) if (mc <= MC_1_14)
p = setupLayer(g, L_VORONOI_1, mapVoronoi114, mc, 4, 7, 10, p, 0); p = setupLayer(g, L_VORONOI_1, mapVoronoi114, mc, 4, 3, 10, p, 0);
else else
p = setupLayer(g, L_VORONOI_1, mapVoronoi, mc, 4, 7, LAYER_INIT_SHA, p, 0); p = setupLayer(g, L_VORONOI_1, mapVoronoi, mc, 4, 3, LAYER_INIT_SHA, p, 0);
} }
g->entry_1 = p; g->entry_1 = p;
@ -277,11 +277,18 @@ void setupGenerator(LayerStack *g, int mc)
/* Recursively calculates the minimum buffer size required to generate an area /* Recursively calculates the minimum buffer size required to generate an area
* of the specified size from the current layer onwards. * of the specified size from the current layer onwards.
*/ */
static void getMaxArea(const Layer *layer, int areaX, int areaZ, int *maxX, int *maxZ) static void getMaxArea(
const Layer *layer, int areaX, int areaZ, int *maxX, int *maxZ, size_t *siz)
{ {
if (layer == NULL) if (layer == NULL)
return; return;
areaX += layer->edge;
areaZ += layer->edge;
if (areaX > *maxX) *maxX = areaX;
if (areaZ > *maxZ) *maxZ = areaZ;
if (layer->zoom == 2) if (layer->zoom == 2)
{ {
areaX >>= 1; areaX >>= 1;
@ -293,31 +300,28 @@ static void getMaxArea(const Layer *layer, int areaX, int areaZ, int *maxX, int
areaZ >>= 2; areaZ >>= 2;
} }
areaX += layer->edge; // multi-layers and zoom-layers use a temporary copy of their parent area
areaZ += layer->edge; if (layer->p2 || layer->zoom != 1)
*siz += areaX * areaZ;
if (areaX > *maxX) *maxX = areaX; getMaxArea(layer->p, areaX, areaZ, maxX, maxZ, siz);
if (areaZ > *maxZ) *maxZ = areaZ; if (layer->p2)
getMaxArea(layer->p2, areaX, areaZ, maxX, maxZ, siz);
getMaxArea(layer->p, areaX, areaZ, maxX, maxZ);
getMaxArea(layer->p2, areaX, areaZ, maxX, maxZ);
} }
int calcRequiredBuf(const Layer *layer, int areaX, int areaZ) size_t calcRequiredBuf(const Layer *layer, int areaX, int areaZ)
{ {
int maxX = areaX, maxZ = areaZ; int maxX = areaX, maxZ = areaZ;
getMaxArea(layer, areaX, areaZ, &maxX, &maxZ); size_t bufsiz = 0;
getMaxArea(layer, areaX, areaZ, &maxX, &maxZ, &bufsiz);
return maxX * maxZ; return bufsiz + maxX * (size_t)maxZ;
} }
int *allocCache(const Layer *layer, int sizeX, int sizeZ) int *allocCache(const Layer *layer, int sizeX, int sizeZ)
{ {
int size = calcRequiredBuf(layer, sizeX, sizeZ); size_t bytes = calcRequiredBuf(layer, sizeX, sizeZ) * sizeof(int);
int *ret = (int *) malloc(bytes);
int *ret = (int *) malloc(sizeof(*ret)*size); memset(ret, 0, bytes);
memset(ret, 0, sizeof(*ret)*size);
return ret; return ret;
} }

2
generator.h
View File

@ -103,7 +103,7 @@ void setupGeneratorLargeBiomes(LayerStack *g, int mc, int largeBiomes);
/* Calculates the minimum size of the buffers required to generate an area of /* Calculates the minimum size of the buffers required to generate an area of
* dimensions 'sizeX' by 'sizeZ' at the specified layer. * dimensions 'sizeX' by 'sizeZ' at the specified layer.
*/ */
int calcRequiredBuf(const Layer *layer, int areaX, int areaZ); size_t calcRequiredBuf(const Layer *layer, int areaX, int areaZ);
/* Allocates an amount of memory required to generate an area of dimensions /* Allocates an amount of memory required to generate an area of dimensions
* 'sizeX' by 'sizeZ' for the magnification of the given layer. * 'sizeX' by 'sizeZ' for the magnification of the given layer.

223
layers.c
View File

@ -1085,9 +1085,9 @@ int mapZoomFuzzy(const Layer * l, int * out, int x, int z, int w, int h)
return err; return err;
int newW = (pW) << 1; int newW = (pW) << 1;
int newH = (pH) << 1; //int newH = (pH) << 1;
int idx, v00, v01, v10, v11; int idx, v00, v01, v10, v11;
int *buf = (int*) malloc((newW+1)*(newH+1)*sizeof(*buf)); int *buf = out + pW * pH; //(int*) malloc((newW+1)*(newH+1)*sizeof(*buf));
const uint32_t st = (uint32_t)l->startSalt; const uint32_t st = (uint32_t)l->startSalt;
const uint32_t ss = (uint32_t)l->startSeed; const uint32_t ss = (uint32_t)l->startSeed;
@ -1144,10 +1144,9 @@ int mapZoomFuzzy(const Layer * l, int * out, int x, int z, int w, int h)
for (j = 0; j < h; j++) for (j = 0; j < h; j++)
{ {
memcpy(&out[j*w], &buf[(j + (z & 1))*newW + (x & 1)], w*sizeof(int)); memmove(&out[j*w], &buf[(j + (z & 1))*newW + (x & 1)], w*sizeof(int));
} }
//free(buf);
free(buf);
return 0; return 0;
} }
@ -1189,9 +1188,9 @@ int mapZoom(const Layer * l, int * out, int x, int z, int w, int h)
return err; return err;
int newW = (pW) << 1; int newW = (pW) << 1;
int newH = (pH) << 1; //int newH = (pH) << 1;
int idx, v00, v01, v10, v11; int idx, v00, v01, v10, v11;
int *buf = (int*) malloc((newW+1)*(newH+1)*sizeof(*buf)); int *buf = out + pW * pH; //(int*) malloc((newW+1)*(newH+1)*sizeof(*buf));
const uint32_t st = (uint32_t)l->startSalt; const uint32_t st = (uint32_t)l->startSalt;
const uint32_t ss = (uint32_t)l->startSeed; const uint32_t ss = (uint32_t)l->startSeed;
@ -1246,10 +1245,9 @@ int mapZoom(const Layer * l, int * out, int x, int z, int w, int h)
for (j = 0; j < h; j++) for (j = 0; j < h; j++)
{ {
memcpy(&out[j*w], &buf[(j + (z & 1))*newW + (x & 1)], w*sizeof(int)); memmove(&out[j*w], &buf[(j + (z & 1))*newW + (x & 1)], w*sizeof(int));
} }
//free(buf);
free(buf);
return 0; return 0;
} }
@ -2037,7 +2035,6 @@ int mapHills(const Layer * l, int * out, int x, int z, int w, int h)
int pW = w + 2; int pW = w + 2;
int pH = h + 2; int pH = h + 2;
int i, j; int i, j;
int *buf = NULL;
if U(l->p2 == NULL) if U(l->p2 == NULL)
{ {
@ -2045,19 +2042,15 @@ int mapHills(const Layer * l, int * out, int x, int z, int w, int h)
exit(1); exit(1);
} }
int err = l->p->getMap(l->p, out, pX, pZ, pW, pH); int err;
err = l->p->getMap(l->p, out, pX, pZ, pW, pH);
if U(err != 0) if U(err != 0)
return err; return err;
buf = (int *) malloc(pW*pH*sizeof(int)); int *riv = out + pW * pH;
memcpy(buf, out, pW*pH*sizeof(int)); err = l->p2->getMap(l->p2, riv, pX, pZ, pW, pH);
err = l->p2->getMap(l->p2, out, pX, pZ, pW, pH);
if U(err != 0) if U(err != 0)
{
free(buf);
return err; return err;
}
int mc = l->mc; int mc = l->mc;
uint64_t st = l->startSalt; uint64_t st = l->startSalt;
@ -2068,8 +2061,8 @@ int mapHills(const Layer * l, int * out, int x, int z, int w, int h)
{ {
for (i = 0; i < w; i++) for (i = 0; i < w; i++)
{ {
int a11 = buf[i+1 + (j+1)*pW]; // biome branch int a11 = out[i+1 + (j+1)*pW]; // biome branch
int b11 = out[i+1 + (j+1)*pW]; // river branch int b11 = riv[i+1 + (j+1)*pW]; // river branch
int idx = i + j*w; int idx = i + j*w;
int bn = -1; int bn = -1;
@ -2166,10 +2159,10 @@ int mapHills(const Layer * l, int * out, int x, int z, int w, int h)
if (hillID != a11) if (hillID != a11)
{ {
int a10 = buf[i+1 + (j+0)*pW]; int a10 = out[i+1 + (j+0)*pW];
int a21 = buf[i+2 + (j+1)*pW]; int a21 = out[i+2 + (j+1)*pW];
int a01 = buf[i+0 + (j+1)*pW]; int a01 = out[i+0 + (j+1)*pW];
int a12 = buf[i+1 + (j+2)*pW]; int a12 = out[i+1 + (j+2)*pW];
int equals = 0; int equals = 0;
if (areSimilar(mc, a10, a11)) equals++; if (areSimilar(mc, a10, a11)) equals++;
@ -2195,7 +2188,6 @@ int mapHills(const Layer * l, int * out, int x, int z, int w, int h)
} }
} }
free(buf);
return 0; return 0;
} }
@ -2519,39 +2511,31 @@ int mapSwampRiver(const Layer * l, int * out, int x, int z, int w, int h)
int mapRiverMix(const Layer * l, int * out, int x, int z, int w, int h) int mapRiverMix(const Layer * l, int * out, int x, int z, int w, int h)
{ {
int idx;
int len;
int *buf;
if U(l->p2 == NULL) if U(l->p2 == NULL)
{ {
printf("mapRiverMix() requires two parents! Use setupMultiLayer()\n"); printf("mapRiverMix() requires two parents! Use setupMultiLayer()\n");
exit(1); exit(1);
} }
int err = l->p->getMap(l->p, out, x, z, w, h); // biome chain int err = l->p->getMap(l->p, out, x, z, w, h); // biome chain
if U(err != 0) if U(err != 0)
return err; return err;
len = w*h; int idx;
buf = (int *) malloc(len*sizeof(int));
memcpy(buf, out, len*sizeof(int));
err = l->p2->getMap(l->p2, out, x, z, w, h); // rivers
if U(err != 0)
{
free(buf);
return err;
}
int mc = l->mc; int mc = l->mc;
int len = w*h;
int *buf = out + len;
err = l->p2->getMap(l->p2, buf, x, z, w, h); // rivers
if U(err != 0)
return err;
for (idx = 0; idx < len; idx++) for (idx = 0; idx < len; idx++)
{ {
int v = buf[idx]; int v = out[idx];
if (out[idx] == river && v != ocean && (mc < MC_1_7 || !isOceanic(v))) if (buf[idx] == river && v != ocean && (mc < MC_1_7 || !isOceanic(v)))
{ {
if (v == snowy_tundra) if (v == snowy_tundra)
v = frozen_river; v = frozen_river;
@ -2564,7 +2548,6 @@ int mapRiverMix(const Layer * l, int * out, int x, int z, int w, int h)
out[idx] = v; out[idx] = v;
} }
free(buf);
return 0; return 0;
} }
@ -2599,7 +2582,6 @@ int mapOceanTemp(const Layer * l, int * out, int x, int z, int w, int h)
int mapOceanMix(const Layer * l, int * out, int x, int z, int w, int h) int mapOceanMix(const Layer * l, int * out, int x, int z, int w, int h)
{ {
int *land, *otyp;
int i, j; int i, j;
int lx0, lx1, lz0, lz1, lw, lh; int lx0, lx1, lz0, lz1, lw, lh;
@ -2613,10 +2595,8 @@ int mapOceanMix(const Layer * l, int * out, int x, int z, int w, int h)
if U(err != 0) if U(err != 0)
return err; return err;
otyp = (int *) malloc(w*h*sizeof(int)); // determine the minimum required land area: (x+lx0, z+lz0), (lw, lh)
memcpy(otyp, out, w*h*sizeof(int)); // (the extra border is only required if there is warm or frozen ocean)
// determine the minimum required land area
lx0 = 0; lx1 = w; lx0 = 0; lx1 = w;
lz0 = 0; lz1 = h; lz0 = 0; lz1 = h;
@ -2627,7 +2607,7 @@ int mapOceanMix(const Layer * l, int * out, int x, int z, int w, int h)
{ {
if (jcentre && i-8 > 0 && i+9 < w) if (jcentre && i-8 > 0 && i+9 < w)
continue; continue;
int oceanID = otyp[i + j*w]; int oceanID = out[i + j*w];
if (oceanID == warm_ocean || oceanID == frozen_ocean) if (oceanID == warm_ocean || oceanID == frozen_ocean)
{ {
if (i-8 < lx0) lx0 = i-8; if (i-8 < lx0) lx0 = i-8;
@ -2638,26 +2618,20 @@ int mapOceanMix(const Layer * l, int * out, int x, int z, int w, int h)
} }
} }
int *land = out + w*h;
lw = lx1 - lx0; lw = lx1 - lx0;
lh = lz1 - lz0; lh = lz1 - lz0;
err = l->p->getMap(l->p, out, x+lx0, z+lz0, lw, lh); err = l->p->getMap(l->p, land, x+lx0, z+lz0, lw, lh);
if U(err != 0) if U(err != 0)
{
free(otyp);
return err; return err;
}
land = (int *) malloc(lw*lh*sizeof(int));
memcpy(land, out, lw*lh*sizeof(int));
for (j = 0; j < h; j++) for (j = 0; j < h; j++)
{ {
for (i = 0; i < w; i++) for (i = 0; i < w; i++)
{ {
int landID, oceanID, replaceID; int landID = land[(i-lx0) + (j-lz0)*lw];
int oceanID = out[i + j*w];
landID = land[(i-lx0) + (j-lz0)*lw]; int replaceID = 0;
int ii, jj; int ii, jj;
if (!isOceanic(landID)) if (!isOceanic(landID))
@ -2666,18 +2640,16 @@ int mapOceanMix(const Layer * l, int * out, int x, int z, int w, int h)
continue; continue;
} }
oceanID = otyp[i + j*w];
if (oceanID == warm_ocean ) replaceID = lukewarm_ocean; if (oceanID == warm_ocean ) replaceID = lukewarm_ocean;
else if (oceanID == frozen_ocean) replaceID = cold_ocean; if (oceanID == frozen_ocean) replaceID = cold_ocean;
else replaceID = -1; if (replaceID)
if (replaceID > 0)
{ {
for (ii = -8; ii <= 8; ii += 4) for (ii = -8; ii <= 8; ii += 4)
{ {
for (jj = -8; jj <= 8; jj += 4) for (jj = -8; jj <= 8; jj += 4)
{ {
if (!isOceanic(land[(i+ii-lx0) + (j+jj-lz0)*lw])) int id = land[(i+ii-lx0) + (j+jj-lz0)*lw];
if (!isOceanic(id))
{ {
out[i + j*w] = replaceID; out[i + j*w] = replaceID;
goto loop_x; goto loop_x;
@ -2711,9 +2683,6 @@ int mapOceanMix(const Layer * l, int * out, int x, int z, int w, int h)
} }
} }
free(land);
free(otyp);
return 0; return 0;
} }
@ -2752,7 +2721,7 @@ int mapVoronoi(const Layer * l, int * out, int x, int z, int w, int h)
} }
uint64_t sha = l->startSalt; uint64_t sha = l->startSalt;
int *buf = (int *) malloc(w*h*sizeof(*buf)); int *buf = out + pW * pH; //(int *) malloc(w*h*sizeof(*buf));
int x000, x001, x010, x011, x100, x101, x110, x111; int x000, x001, x010, x011, x100, x101, x110, x111;
int y000, y001, y010, y011, y100, y101, y110, y111; int y000, y001, y010, y011, y100, y101, y110, y111;
@ -2895,8 +2864,8 @@ int mapVoronoi(const Layer * l, int * out, int x, int z, int w, int h)
} }
} }
memcpy(out, buf, w*h*sizeof(*buf)); memmove(out, buf, w*h*sizeof(*buf));
free(buf);
return 0; return 0;
} }
@ -2917,81 +2886,95 @@ int mapVoronoi114(const Layer * l, int * out, int x, int z, int w, int h)
return err; return err;
} }
int newW = pW << 2; int i, j, ii, jj, pi, pj, pix, pjz, i4, j4, mi, mj;
int newH = pH << 2; int v00, v01, v10, v11, v;
int *buf = (int *) malloc((newW+1)*(newH+1)*sizeof(*buf)); int64_t da1, da2, db1, db2, dc1, dc2, dd1, dd2;
int i, j; int64_t sja, sjb, sjc, sjd, da, db, dc, dd;
int *buf = out + pW * pH;
uint64_t st = l->startSalt; uint64_t st = l->startSalt;
uint64_t ss = l->startSeed; uint64_t ss = l->startSeed;
uint64_t cs; uint64_t cs;
for (j = 0; j < pH-1; j++) for (pj = 0; pj < pH-1; pj++)
{ {
int v00 = out[(j+0)*pW]; v00 = out[(pj+0)*pW];
int v01 = out[(j+1)*pW]; v01 = out[(pj+1)*pW];
int v10, v11; pjz = pZ + pj;
j4 = ((pjz) << 2) - z;
for (i = 0; i < pW-1; i++, v00 = v10, v01 = v11) for (pi = 0; pi < pW-1; pi++, v00 = v10, v01 = v11)
{ {
int ii, jj; pix = pX + pi;
int *pbuf = buf + (j << 2) * newW + (i << 2); i4 = ((pix) << 2) - x;
// try to prefetch the relevant rows to help prevent cache misses // try to prefetch the relevant rows to help prevent cache misses
PREFETCH( pbuf + newW*0, 1, 1 ); PREFETCH( buf + ((pjz << 2) + 0) * w + pi, 1, 1 );
PREFETCH( pbuf + newW*1, 1, 1 ); PREFETCH( buf + ((pjz << 2) + 1) * w + pi, 1, 1 );
PREFETCH( pbuf + newW*2, 1, 1 ); PREFETCH( buf + ((pjz << 2) + 2) * w + pi, 1, 1 );
PREFETCH( pbuf + newW*3, 1, 1 ); PREFETCH( buf + ((pjz << 2) + 3) * w + pi, 1, 1 );
v10 = out[i+1 + (j+0)*pW]; v10 = out[pi+1 + (pj+0)*pW];
v11 = out[i+1 + (j+1)*pW]; v11 = out[pi+1 + (pj+1)*pW];
if (v00 == v01 && v00 == v10 && v00 == v11) if (v00 == v01 && v00 == v10 && v00 == v11)
{ {
for (jj = 0; jj < 4; jj++) for (jj = 0; jj < 4; jj++)
{
j = j4 + jj;
if (j < 0 || j >= h) continue;
for (ii = 0; ii < 4; ii++) for (ii = 0; ii < 4; ii++)
pbuf[ii + jj*newW] = v00; {
i = i4 + ii;
if (i < 0 || i >= w) continue;
buf[j*w + i] = v00;
}
}
continue; continue;
} }
cs = getChunkSeed(ss, (i+pX) << 2, (j+pZ) << 2); cs = getChunkSeed(ss, (pi+pX) << 2, (pj+pZ) << 2);
int64_t da1 = (mcFirstInt(cs, 1024) - 512) * 36; da1 = (mcFirstInt(cs, 1024) - 512) * 36;
cs = mcStepSeed(cs, st); cs = mcStepSeed(cs, st);
int64_t da2 = (mcFirstInt(cs, 1024) - 512) * 36; da2 = (mcFirstInt(cs, 1024) - 512) * 36;
cs = getChunkSeed(ss, (i+pX+1) << 2, (j+pZ) << 2); cs = getChunkSeed(ss, (pi+pX+1) << 2, (pj+pZ) << 2);
int64_t db1 = (mcFirstInt(cs, 1024) - 512) * 36 + 40*1024; db1 = (mcFirstInt(cs, 1024) - 512) * 36 + 40*1024;
cs = mcStepSeed(cs, st); cs = mcStepSeed(cs, st);
int64_t db2 = (mcFirstInt(cs, 1024) - 512) * 36; db2 = (mcFirstInt(cs, 1024) - 512) * 36;
cs = getChunkSeed(ss, (i+pX) << 2, (j+pZ+1) << 2); cs = getChunkSeed(ss, (pi+pX) << 2, (pj+pZ+1) << 2);
int64_t dc1 = (mcFirstInt(cs, 1024) - 512) * 36; dc1 = (mcFirstInt(cs, 1024) - 512) * 36;
cs = mcStepSeed(cs, st); cs = mcStepSeed(cs, st);
int64_t dc2 = (mcFirstInt(cs, 1024) - 512) * 36 + 40*1024; dc2 = (mcFirstInt(cs, 1024) - 512) * 36 + 40*1024;
cs = getChunkSeed(ss, (i+pX+1) << 2, (j+pZ+1) << 2); cs = getChunkSeed(ss, (pi+pX+1) << 2, (pj+pZ+1) << 2);
int64_t dd1 = (mcFirstInt(cs, 1024) - 512) * 36 + 40*1024; dd1 = (mcFirstInt(cs, 1024) - 512) * 36 + 40*1024;
cs = mcStepSeed(cs, st); cs = mcStepSeed(cs, st);
int64_t dd2 = (mcFirstInt(cs, 1024) - 512) * 36 + 40*1024; dd2 = (mcFirstInt(cs, 1024) - 512) * 36 + 40*1024;
for (jj = 0; jj < 4; jj++) for (jj = 0; jj < 4; jj++)
{ {
int mj = 10240*jj; j = j4 + jj;
int64_t sja = (mj-da2) * (mj-da2); if (j < 0 || j >= h) continue;
int64_t sjb = (mj-db2) * (mj-db2);
int64_t sjc = (mj-dc2) * (mj-dc2); mj = 10240*jj;
int64_t sjd = (mj-dd2) * (mj-dd2); sja = (mj-da2) * (mj-da2);
int *p = pbuf + jj*newW; sjb = (mj-db2) * (mj-db2);
sjc = (mj-dc2) * (mj-dc2);
sjd = (mj-dd2) * (mj-dd2);
for (ii = 0; ii < 4; ii++) for (ii = 0; ii < 4; ii++)
{ {
int mi = 10240*ii; i = i4 + ii;
int64_t da = (mi-da1) * (mi-da1) + sja; if (i < 0 || i >= w) continue;
int64_t db = (mi-db1) * (mi-db1) + sjb;
int64_t dc = (mi-dc1) * (mi-dc1) + sjc; mi = 10240*ii;
int64_t dd = (mi-dd1) * (mi-dd1) + sjd; da = (mi-da1) * (mi-da1) + sja;
db = (mi-db1) * (mi-db1) + sjb;
dc = (mi-dc1) * (mi-dc1) + sjc;
dd = (mi-dd1) * (mi-dd1) + sjd;
int v;
if U((da < db) && (da < dc) && (da < dd)) if U((da < db) && (da < dc) && (da < dd))
v = v00; v = v00;
else if U((db < da) && (db < dc) && (db < dd)) else if U((db < da) && (db < dc) && (db < dd))
@ -3001,18 +2984,14 @@ int mapVoronoi114(const Layer * l, int * out, int x, int z, int w, int h)
else else
v = v11; v = v11;
p[ii] = v; buf[j*w + i] = v;
} }
} }
} }
} }
for (j = 0; j < h; j++) memmove(out, buf, w*h*sizeof(*buf));
{
memcpy(&out[j * w], &buf[(j + (z & 3))*newW + (x & 3)], w*sizeof(int));
}
free(buf);
return 0; return 0;
} }

2
layers.h
View File

@ -179,7 +179,7 @@ STRUCT(Layer)
uint64_t layerSalt; // processed salt or initialization mode uint64_t layerSalt; // processed salt or initialization mode
uint64_t startSalt; // (depends on world seed) used to step PRNG forward uint64_t startSalt; // (depends on world seed) used to step PRNG forward
uint64_t startSeed; // (depends on world seed) starting point for chunk seeds uint64_t startSeed; // (depends on world seed) start for chunk seeds
void *noise; // (depends on world seed) noise map data void *noise; // (depends on world seed) noise map data
void *data; // generic data for custom layers void *data; // generic data for custom layers