AstralTransRocketries/Cubyz
1
0
Fork 0
mirror of https://github.com/PixelGuys/Cubyz.git synced 2025-08-03 11:17:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix panic during map generation from a float that was too large.

Browse Source 
fixes #1117
This commit is contained in:
IntegratedQuantum 2025-02-26 17:59:34 +01:00
parent 43773e96b4
commit 37136304a8
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/server/terrain/mapgen/MapGenV1.zig
View File

@ -96,12 +96,12 @@ pub fn generateMapFragment(map: *MapFragment, worldSeed: u64) void {
const offsetY = (yOffsetMap.get(x, y) - 0.5)*offsetScale;
const updatedX = wx + offsetX;
const updatedY = wy + offsetY;
var xBiome: i32 = @intFromFloat(@floor((updatedX - @as(f32, @floatFromInt(map.pos.wx)))/biomeSize));
var yBiome: i32 = @intFromFloat(@floor((updatedY - @as(f32, @floatFromInt(map.pos.wy)))/biomeSize));
const relXBiome = (0.5 + offsetX + @as(f32, @floatFromInt(x*map.pos.voxelSize -% xBiome*biomeSize)))/biomeSize;
xBiome += offset;
const relYBiome = (0.5 + offsetY + @as(f32, @floatFromInt(y*map.pos.voxelSize -% yBiome*biomeSize)))/biomeSize;
yBiome += offset;
const rawXBiome = (updatedX - @as(f32, @floatFromInt(map.pos.wx)))/biomeSize;
const rawYBiome = (updatedY - @as(f32, @floatFromInt(map.pos.wy)))/biomeSize;
const xBiome: i32 = @as(i32, @intFromFloat(@floor(rawXBiome))) + offset;
const yBiome: i32 = @as(i32, @intFromFloat(@floor(rawYBiome))) + offset;
const relXBiome = rawXBiome - @floor(rawXBiome);
const relYBiome = rawYBiome - @floor(rawYBiome);
var closestBiome: *const terrain.biomes.Biome = undefined;
if(relXBiome < 0.5) {
if(relYBiome < 0.5) {
@ -156,11 +156,9 @@ pub fn generateMapFragment(map: *MapFragment, worldSeed: u64) void {
// Select a biome. Also adding some white noise to make a smoother transition.
xBiome = @intFromFloat(@round((updatedX - @as(f32, @floatFromInt(map.pos.wx)))/biomeSize));
xBiome += offset;
yBiome = @intFromFloat(@round((updatedY - @as(f32, @floatFromInt(map.pos.wy)))/biomeSize));
yBiome += offset;
const biomePoint = biomePositions.get(@intCast(xBiome), @intCast(yBiome));
const roundedXBiome = @as(i32, @intFromFloat(@round(rawXBiome))) + offset;
const roundedYBiome = @as(i32, @intFromFloat(@round(rawYBiome))) + offset;
const biomePoint = biomePositions.get(@intCast(roundedXBiome), @intCast(roundedYBiome));
map.biomeMap[x][y] = biomePoint.biome;
}
}