aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/CanyonFeature.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Minecraft.World/CanyonFeature.cpp')
-rw-r--r--Minecraft.World/CanyonFeature.cpp168
1 files changed, 84 insertions, 84 deletions
diff --git a/Minecraft.World/CanyonFeature.cpp b/Minecraft.World/CanyonFeature.cpp
index b96c97e0..6d1dda64 100644
--- a/Minecraft.World/CanyonFeature.cpp
+++ b/Minecraft.World/CanyonFeature.cpp
@@ -9,26 +9,26 @@ void CanyonFeature::addTunnel(__int64 seed, int xOffs, int zOffs, byteArray bloc
MemSect(49);
Random *random = new Random(seed);
MemSect(0);
- double xMid = xOffs * 16 + 8;
- double zMid = zOffs * 16 + 8;
+ double xMid = xOffs * 16 + 8;
+ double zMid = zOffs * 16 + 8;
- float yRota = 0;
- float xRota = 0;
- // int dist = CAVE_RADIUS * 16 - 16;
- // if (step>0) dist = step*2;
+ float yRota = 0;
+ float xRota = 0;
+ // int dist = CAVE_RADIUS * 16 - 16;
+ // if (step>0) dist = step*2;
- if (dist <= 0)
+ if (dist <= 0)
{
- int max = radius * 16 - 16;
- dist = max - random->nextInt(max / 4);
- }
- bool singleStep = false;
+ int max = radius * 16 - 16;
+ dist = max - random->nextInt(max / 4);
+ }
+ bool singleStep = false;
- if (step == -1)
+ if (step == -1)
{
- step = dist / 2;
- singleStep = true;
- }
+ step = dist / 2;
+ singleStep = true;
+ }
float f = 1;
for (int i = 0; i < Level::genDepth; i++)
@@ -40,94 +40,94 @@ void CanyonFeature::addTunnel(__int64 seed, int xOffs, int zOffs, byteArray bloc
rs[i] = f * f;
}
- for (; step < dist; step++)
+ for (; step < dist; step++)
{
- double rad = 1.5 + (Mth::sin(step * PI / dist) * thickness) * 1;
- double yRad = rad * yScale;
+ double rad = 1.5 + (Mth::sin(step * PI / dist) * thickness) * 1;
+ double yRad = rad * yScale;
rad *= (random->nextFloat() * 0.25 + 0.75);
yRad *= (random->nextFloat() * 0.25 + 0.75);
- float xc = Mth::cos(xRot);
- float xs = Mth::sin(xRot);
- xCave += Mth::cos(yRot) * xc;
- yCave += xs;
- zCave += Mth::sin(yRot) * xc;
+ float xc = Mth::cos(xRot);
+ float xs = Mth::sin(xRot);
+ xCave += Mth::cos(yRot) * xc;
+ yCave += xs;
+ zCave += Mth::sin(yRot) * xc;
xRot *= 0.7f;
- xRot += xRota * 0.05f;
- yRot += yRota * 0.05f;
+ xRot += xRota * 0.05f;
+ yRot += yRota * 0.05f;
- xRota *= 0.80f;
- yRota *= 0.50f;
- xRota += (random->nextFloat() - random->nextFloat()) * random->nextFloat() * 2;
- yRota += (random->nextFloat() - random->nextFloat()) * random->nextFloat() * 4;
+ xRota *= 0.80f;
+ yRota *= 0.50f;
+ xRota += (random->nextFloat() - random->nextFloat()) * random->nextFloat() * 2;
+ yRota += (random->nextFloat() - random->nextFloat()) * random->nextFloat() * 4;
- if (!singleStep && random->nextInt(4) == 0) continue;
+ if (!singleStep && random->nextInt(4) == 0) continue;
- {
- double xd = xCave - xMid;
- double zd = zCave - zMid;
- double remaining = dist - step;
- double rr = (thickness + 2) + 16;
- if (xd * xd + zd * zd - (remaining * remaining) > rr * rr)
+ {
+ double xd = xCave - xMid;
+ double zd = zCave - zMid;
+ double remaining = dist - step;
+ double rr = (thickness + 2) + 16;
+ if (xd * xd + zd * zd - (remaining * remaining) > rr * rr)
{
delete random;
- return;
- }
- }
+ return;
+ }
+ }
- if (xCave < xMid - 16 - rad * 2 || zCave < zMid - 16 - rad * 2 || xCave > xMid + 16 + rad * 2 || zCave > zMid + 16 + rad * 2) continue;
+ if (xCave < xMid - 16 - rad * 2 || zCave < zMid - 16 - rad * 2 || xCave > xMid + 16 + rad * 2 || zCave > zMid + 16 + rad * 2) continue;
- int x0 = Mth::floor(xCave - rad) - xOffs * 16 - 1;
- int x1 = Mth::floor(xCave + rad) - xOffs * 16 + 1;
+ int x0 = Mth::floor(xCave - rad) - xOffs * 16 - 1;
+ int x1 = Mth::floor(xCave + rad) - xOffs * 16 + 1;
- int y0 = Mth::floor(yCave - yRad) - 1;
- int y1 = Mth::floor(yCave + yRad) + 1;
+ int y0 = Mth::floor(yCave - yRad) - 1;
+ int y1 = Mth::floor(yCave + yRad) + 1;
- int z0 = Mth::floor(zCave - rad) - zOffs * 16 - 1;
- int z1 = Mth::floor(zCave + rad) - zOffs * 16 + 1;
+ int z0 = Mth::floor(zCave - rad) - zOffs * 16 - 1;
+ int z1 = Mth::floor(zCave + rad) - zOffs * 16 + 1;
- if (x0 < 0) x0 = 0;
- if (x1 > 16) x1 = 16;
+ if (x0 < 0) x0 = 0;
+ if (x1 > 16) x1 = 16;
- if (y0 < 1) y0 = 1;
- if (y1 > Level::genDepth - 8) y1 = Level::genDepth - 8;
+ if (y0 < 1) y0 = 1;
+ if (y1 > Level::genDepth - 8) y1 = Level::genDepth - 8;
- if (z0 < 0) z0 = 0;
- if (z1 > 16) z1 = 16;
+ if (z0 < 0) z0 = 0;
+ if (z1 > 16) z1 = 16;
- bool detectedWater = false;
- for (int xx = x0; !detectedWater && xx < x1; xx++)
+ bool detectedWater = false;
+ for (int xx = x0; !detectedWater && xx < x1; xx++)
{
- for (int zz = z0; !detectedWater && zz < z1; zz++)
+ for (int zz = z0; !detectedWater && zz < z1; zz++)
{
- for (int yy = y1 + 1; !detectedWater && yy >= y0 - 1; yy--)
+ for (int yy = y1 + 1; !detectedWater && yy >= y0 - 1; yy--)
{
- int p = (xx * 16 + zz) * Level::genDepth + yy;
- if (yy < 0 || yy >= Level::genDepth) continue;
- if (blocks[p] == Tile::water_Id || blocks[p] == Tile::calmWater_Id)
+ int p = (xx * 16 + zz) * Level::genDepth + yy;
+ if (yy < 0 || yy >= Level::genDepth) continue;
+ if (blocks[p] == Tile::water_Id || blocks[p] == Tile::calmWater_Id)
{
- detectedWater = true;
- }
- if (yy != y0 - 1 && xx != x0 && xx != x1 - 1 && zz != z0 && zz != z1 - 1)
+ detectedWater = true;
+ }
+ if (yy != y0 - 1 && xx != x0 && xx != x1 - 1 && zz != z0 && zz != z1 - 1)
{
- yy = y0;
- }
- }
- }
- }
- if (detectedWater) continue;
-
- for (int xx = x0; xx < x1; xx++)
+ yy = y0;
+ }
+ }
+ }
+ }
+ if (detectedWater) continue;
+
+ for (int xx = x0; xx < x1; xx++)
{
- double xd = ((xx + xOffs * 16 + 0.5) - xCave) / rad;
- for (int zz = z0; zz < z1; zz++)
+ double xd = ((xx + xOffs * 16 + 0.5) - xCave) / rad;
+ for (int zz = z0; zz < z1; zz++)
{
- double zd = ((zz + zOffs * 16 + 0.5) - zCave) / rad;
- int p = (xx * 16 + zz) * Level::genDepth + y1;
- bool hasGrass = false;
+ double zd = ((zz + zOffs * 16 + 0.5) - zCave) / rad;
+ int p = (xx * 16 + zz) * Level::genDepth + y1;
+ bool hasGrass = false;
if (xd * xd + zd * zd < 1)
{
for (int yy = y1 - 1; yy >= y0; yy--)
@@ -137,7 +137,7 @@ void CanyonFeature::addTunnel(__int64 seed, int xOffs, int zOffs, byteArray bloc
{
int block = blocks[p];
if (block == Tile::grass_Id) hasGrass = true;
- if (block == Tile::rock_Id || block == Tile::dirt_Id || block == Tile::grass_Id)
+ if (block == Tile::stone_Id || block == Tile::dirt_Id || block == Tile::grass_Id)
{
if (yy < 10)
{
@@ -153,20 +153,20 @@ void CanyonFeature::addTunnel(__int64 seed, int xOffs, int zOffs, byteArray bloc
p--;
}
}
- }
- }
- if (singleStep) break;
- }
+ }
+ }
+ if (singleStep) break;
+ }
delete random;
}
void CanyonFeature::addFeature(Level *level, int x, int z, int xOffs, int zOffs, byteArray blocks)
{
- if (random->nextInt(50) != 0) return;
+ if (random->nextInt(50) != 0) return;
- double xCave = x * 16 + random->nextInt(16);
- double yCave = random->nextInt(random->nextInt(40) + 8) + 20;
- double zCave = z * 16 + random->nextInt(16);
+ double xCave = x * 16 + random->nextInt(16);
+ double yCave = random->nextInt(random->nextInt(40) + 8) + 20;
+ double zCave = z * 16 + random->nextInt(16);
int tunnels = 1;
generated by cgit v1.2.3 (git 2.46.0) at 2026-03-22 02:10:31 +0000