flatten array

This commit is contained in:
Zoë Gidiere committed 2023-10-05 20:47:52 -06:00
1 parent 9444f9236d
commit 8fba3f9e60
1 file changed
+14 -12
@@ -240,7 +240,7 @@ public class PseudoErosionSampler implements NoiseSampler {
int gridY = fastRound(y); int gridY = fastRound(y);
// Precompute cell positions and lookup values // Precompute cell positions and lookup values
double[][][] cellData = new double[PRECOMPUTE_SIZE][PRECOMPUTE_SIZE][3]; double[] cellData = new double[PRECOMPUTE_SIZE * PRECOMPUTE_SIZE * 3];
for(int xi = -PRECOMPUTE_RADIUS; xi <= PRECOMPUTE_RADIUS; xi++) { for(int xi = -PRECOMPUTE_RADIUS; xi <= PRECOMPUTE_RADIUS; xi++) {
for(int yi = -PRECOMPUTE_RADIUS; yi <= PRECOMPUTE_RADIUS; yi++) { for(int yi = -PRECOMPUTE_RADIUS; yi <= PRECOMPUTE_RADIUS; yi++) {
int jitterIdx = jitterIdx2D(seed, gridX + xi, gridY + yi); int jitterIdx = jitterIdx2D(seed, gridX + xi, gridY + yi);
@@ -255,10 +255,12 @@ public class PseudoErosionSampler implements NoiseSampler {
double lookup = this.lookup.noise(seed, actualCellX, actualCellY); double lookup = this.lookup.noise(seed, actualCellX, actualCellY);
double[] data = cellData[xi+PRECOMPUTE_RADIUS][yi+PRECOMPUTE_RADIUS]; // Calculate linear index for flattened array
data[0] = cellX; int linearIndex = ((xi + PRECOMPUTE_RADIUS) * PRECOMPUTE_SIZE + (yi + PRECOMPUTE_RADIUS)) * 3;
data[1] = cellY;
data[2] = lookup; cellData[linearIndex] = cellX;
cellData[linearIndex + 1] = cellY;
cellData[linearIndex + 2] = lookup;
} }
} }
@@ -272,19 +274,19 @@ public class PseudoErosionSampler implements NoiseSampler {
double connectedCellY = 0; double connectedCellY = 0;
for(int xni = xi - MAX_CONNECTION_RADIUS; xni <= xi + MAX_CONNECTION_RADIUS; xni++) { for(int xni = xi - MAX_CONNECTION_RADIUS; xni <= xi + MAX_CONNECTION_RADIUS; xni++) {
for(int yni = yi - MAX_CONNECTION_RADIUS; yni <= yi + MAX_CONNECTION_RADIUS; yni++) { for(int yni = yi - MAX_CONNECTION_RADIUS; yni <= yi + MAX_CONNECTION_RADIUS; yni++) {
double[] data = cellData[xni+PRECOMPUTE_RADIUS][yni+PRECOMPUTE_RADIUS]; int linearIndex = ((xni + PRECOMPUTE_RADIUS) * PRECOMPUTE_SIZE + (yni + PRECOMPUTE_RADIUS)) * 3;
double lookup = data[2]; double lookup = cellData[linearIndex + 2];
if(lookup < lowestLookup) { if(lookup < lowestLookup) {
lowestLookup = lookup; lowestLookup = lookup;
connectedCellX = data[0]; connectedCellX = cellData[linearIndex];
connectedCellY = data[1]; connectedCellY = cellData[linearIndex + 1];
} }
} }
} }
double[] data = cellData[xi+PRECOMPUTE_RADIUS][yi+PRECOMPUTE_RADIUS]; int linearIndex = ((xi + PRECOMPUTE_RADIUS) * PRECOMPUTE_SIZE + (yi + PRECOMPUTE_RADIUS)) * 3;
double cellX = data[0]; double cellX = cellData[linearIndex];
double cellY = data[1]; double cellY = cellData[linearIndex + 1];
// Calculate SDF for line between the current cell position and the surrounding cell with the lowest lookup // Calculate SDF for line between the current cell position and the surrounding cell with the lowest lookup
double distance = lineSdf2D(x, y, cellX, cellY, connectedCellX, connectedCellY); double distance = lineSdf2D(x, y, cellX, cellY, connectedCellX, connectedCellY);