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

Add a terrain border between caves and the ocean floor.

Browse Source 
Fixes #282
Also fixes #281 by making water degradable
This commit is contained in:
IntegratedQuantum 2024-03-25 20:55:31 +01:00
parent 92b38a526e
commit 662ef94d0c
4 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/cubyz/blocks/water.json
View File

@ -5,6 +5,7 @@
], ],
"selectable" : false, "selectable" : false,
"solid" : false, "solid" : false,
"degradable" : true,
"transparent" : true, "transparent" : true,
"hasBackFace" : true, "hasBackFace" : true,
"absorbedLight" : 0x090501, "absorbedLight" : 0x090501,

20
src/server/terrain/CaveBiomeMap.zig
View File

@ -301,6 +301,17 @@ pub const InterpolatableCaveBiomeMapView = struct {
return self.surfaceFragments[index].getBiome(wx, wy); return self.surfaceFragments[index].getBiome(wx, wy);
} }
pub fn getSurfaceHeight(self: InterpolatableCaveBiomeMapView, wx: i32, wy: i32) f32 {
var index: u8 = 0;
if(wx - self.surfaceFragments[0].pos.wx >= MapFragment.mapSize*self.pos.voxelSize) {
index += 2;
}
if(wy - self.surfaceFragments[0].pos.wy >= MapFragment.mapSize*self.pos.voxelSize) {
index += 1;
}
return self.surfaceFragments[index].getHeight(wx, wy);
}
noinline fn _getBiome(self: InterpolatableCaveBiomeMapView, wx: i32, wy: i32, wz: i32, map: u1) *const Biome { noinline fn _getBiome(self: InterpolatableCaveBiomeMapView, wx: i32, wy: i32, wz: i32, map: u1) *const Biome {
var index: u8 = 0; var index: u8 = 0;
if(wx - self.fragments[0].pos.wx >= CaveBiomeMapFragment.caveBiomeMapSize) { if(wx - self.fragments[0].pos.wx >= CaveBiomeMapFragment.caveBiomeMapSize) {
@ -388,14 +399,7 @@ pub const CaveBiomeMapView = struct {
} }
pub fn getSurfaceHeight(self: CaveBiomeMapView, wx: i32, wy: i32) f32 { pub fn getSurfaceHeight(self: CaveBiomeMapView, wx: i32, wy: i32) f32 {
var index: u8 = 0; return self.super.getSurfaceHeight(wx, wy);
if(wx - self.super.surfaceFragments[0].pos.wx >= MapFragment.mapSize*self.super.pos.voxelSize) {
index += 2;
}
if(wy - self.super.surfaceFragments[0].pos.wy >= MapFragment.mapSize*self.super.pos.voxelSize) {
index += 1;
}
return self.super.surfaceFragments[index].getHeight(wx, wy);
} }
pub fn getBiome(self: CaveBiomeMapView, relX: i32, relY: i32, relZ: i32) *const Biome { pub fn getBiome(self: CaveBiomeMapView, relX: i32, relY: i32, relZ: i32) *const Biome {

2
src/server/terrain/CaveMap.zig
View File

@ -32,7 +32,7 @@ pub const CaveMapFragment = struct {
}, },
.voxelShift = @ctz(voxelSize), .voxelShift = @ctz(voxelSize),
}; };
@memset(&self.data, 0); @memset(&self.data, std.math.maxInt(u64));
} }
fn getIndex(x: i32, y: i32) usize { fn getIndex(x: i32, y: i32) usize {

26
src/server/terrain/cavegen/SurfaceGenerator.zig
View File

@ -8,6 +8,7 @@ const terrain = main.server.terrain;
const CaveMapFragment = terrain.CaveMap.CaveMapFragment; const CaveMapFragment = terrain.CaveMap.CaveMapFragment;
const SurfaceMap = terrain.SurfaceMap; const SurfaceMap = terrain.SurfaceMap;
const MapFragment = SurfaceMap.MapFragment; const MapFragment = SurfaceMap.MapFragment;
const InterpolatableCaveBiomeMapView = terrain.CaveBiomeMap.InterpolatableCaveBiomeMapView;
const vec = main.vec; const vec = main.vec;
const Vec3d = vec.Vec3d; const Vec3d = vec.Vec3d;
const Vec3f = vec.Vec3f; const Vec3f = vec.Vec3f;
@ -15,7 +16,7 @@ const Vec3i = vec.Vec3i;
pub const id = "cubyz:surface"; pub const id = "cubyz:surface";
pub const priority = 1024; pub const priority = 131072;
pub const generatorSeed = 0x7658930674389; pub const generatorSeed = 0x7658930674389;
@ -29,13 +30,26 @@ pub fn deinit() void {
pub fn generate(map: *CaveMapFragment, worldSeed: u64) void { pub fn generate(map: *CaveMapFragment, worldSeed: u64) void {
_ = worldSeed; _ = worldSeed;
const mapFragment = SurfaceMap.getOrGenerateFragment(map.pos.wx, map.pos.wy, map.pos.voxelSize); const width = CaveMapFragment.width*map.pos.voxelSize;
defer mapFragment.deinit(); const biomeMap = InterpolatableCaveBiomeMapView.init(map.pos, width);
defer biomeMap.deinit();
var x: u31 = 0; var x: u31 = 0;
while(x < CaveMapFragment.width*map.pos.voxelSize) : (x += map.pos.voxelSize) { while(x < width) : (x += map.pos.voxelSize) {
var y: u31 = 0; var y: u31 = 0;
while(y < CaveMapFragment.width*map.pos.voxelSize) : (y += map.pos.voxelSize) { while(y < width) : (y += map.pos.voxelSize) {
map.addRange(x, y, 0, @as(i32, @intFromFloat(mapFragment.getHeight(map.pos.wx + x, map.pos.wy + y))) - map.pos.wz); const height = biomeMap.getSurfaceHeight(map.pos.wx + x, map.pos.wy + y);
const smallestHeight: i32 = @intFromFloat(@floor(@min(
biomeMap.getSurfaceHeight(map.pos.wx + x + 1, map.pos.wy + y),
biomeMap.getSurfaceHeight(map.pos.wx + x, map.pos.wy + y + 1),
biomeMap.getSurfaceHeight(map.pos.wx + x - 1, map.pos.wy + y),
biomeMap.getSurfaceHeight(map.pos.wx + x, map.pos.wy + y - 1),
height,
) - 0.5));
const relativeHeight: i32 = @as(i32, @intFromFloat(height)) - map.pos.wz;
map.removeRange(x, y, relativeHeight, CaveMapFragment.height*map.pos.voxelSize);
if(smallestHeight < 1) { // Seal off caves that intersect the ocean floor.
map.addRange(x, y, smallestHeight -% 1 -% map.pos.wz, relativeHeight);
}
} }
} }
} }