Split structures out of biomes

src/server/terrain/biomes.zig

@@ -10,70 +10,8 @@ const vec = @import("main.vec");
 const Vec3f = main.vec.Vec3f;
 const Vec3d = main.vec.Vec3d;
 
-pub const SimpleStructureModel = struct { // MARK: SimpleStructureModel
-	pub const GenerationMode = enum {
-		floor,
-		ceiling,
-		floor_and_ceiling,
-		air,
-		underground,
-		water_surface,
-	};
-	const VTable = struct {
-		loadModel: *const fn(parameters: ZonElement) ?*anyopaque,
-		generate: *const fn(self: *anyopaque, generationMode: GenerationMode, x: i32, y: i32, z: i32, chunk: *ServerChunk, caveMap: terrain.CaveMap.CaveMapView, biomeMap: terrain.CaveBiomeMap.CaveBiomeMapView, seed: *u64, isCeiling: bool) void,
-		hashFunction: *const fn(self: *anyopaque) u64,
-		generationMode: GenerationMode,
-	};
-
-	vtable: VTable,
-	data: *anyopaque,
-	chance: f32,
-	priority: f32,
-	generationMode: GenerationMode,
-
-	pub fn initModel(parameters: ZonElement) ?SimpleStructureModel {
-		const id = parameters.get([]const u8, "id", "");
-		const vtable = modelRegistry.get(id) orelse {
-			std.log.err("Couldn't find structure model with id {s}", .{id});
-			return null;
-		};
-		const vtableModel = vtable.loadModel(parameters) orelse {
-			std.log.err("Error occurred while loading structure with id '{s}'. Dropping model from biome.", .{id});
-			return null;
-		};
-		return SimpleStructureModel{
-			.vtable = vtable,
-			.data = vtableModel,
-			.chance = parameters.get(f32, "chance", 0.1),
-			.priority = parameters.get(f32, "priority", 1),
-			.generationMode = std.meta.stringToEnum(GenerationMode, parameters.get([]const u8, "generationMode", "")) orelse vtable.generationMode,
-		};
-	}
-
-	pub fn generate(self: SimpleStructureModel, x: i32, y: i32, z: i32, chunk: *ServerChunk, caveMap: terrain.CaveMap.CaveMapView, biomeMap: terrain.CaveBiomeMap.CaveBiomeMapView, seed: *u64, isCeiling: bool) void {
-		self.vtable.generate(self.data, self.generationMode, x, y, z, chunk, caveMap, biomeMap, seed, isCeiling);
-	}
-
-	var modelRegistry: std.StringHashMapUnmanaged(VTable) = .{};
-
-	pub fn registerGenerator(comptime Generator: type) void {
-		var self: VTable = undefined;
-		self.loadModel = main.utils.castFunctionReturnToOptionalAnyopaque(Generator.loadModel);
-		self.generate = main.utils.castFunctionSelfToAnyopaque(Generator.generate);
-		self.hashFunction = main.utils.castFunctionSelfToAnyopaque(struct {
-			fn hash(ptr: *Generator) u64 {
-				return hashGeneric(ptr.*);
-			}
-		}.hash);
-		self.generationMode = Generator.generationMode;
-		modelRegistry.put(main.globalArena.allocator, Generator.id, self) catch unreachable;
-	}
-
-	fn getHash(self: SimpleStructureModel) u64 {
-		return self.vtable.hashFunction(self.data);
-	}
-};
+const structures_zig = @import("structures.zig");
+pub const SimpleStructureModel = structures_zig.SimpleStructureModel;
 
 const Stripe = struct { // MARK: Stripe
 	direction: ?Vec3d,
@@ -139,7 +77,7 @@ const Stripe = struct { // MARK: Stripe
 	}
 };
 
-fn hashGeneric(input: anytype) u64 {
+pub fn hashGeneric(input: anytype) u64 {
 	const T = @TypeOf(input);
 	return switch(@typeInfo(T)) {
 		.bool => hashCombine(hashInt(@intFromBool(input)), 0xbf58476d1ce4e5b9),
@@ -200,12 +138,12 @@ fn hashGeneric(input: anytype) u64 {
 }
 
 // https://stackoverflow.com/questions/5889238/why-is-xor-the-default-way-to-combine-hashes
-fn hashCombine(left: u64, right: u64) u64 {
+pub fn hashCombine(left: u64, right: u64) u64 {
 	return left ^ (right +% 0x517cc1b727220a95 +% (left << 6) +% (left >> 2));
 }
 
 // https://stackoverflow.com/questions/664014/what-integer-hash-function-are-good-that-accepts-an-integer-hash-key
-fn hashInt(input: u64) u64 {
+pub fn hashInt(input: u64) u64 {
 	var x = input;
 	x = (x ^ (x >> 30))*%0xbf58476d1ce4e5b9;
 	x = (x ^ (x >> 27))*%0x94d049bb133111eb;

src/server/terrain/simple_structures/Boulder.zig

@@ -6,7 +6,7 @@ const ZonElement = main.ZonElement;
 const terrain = main.server.terrain;
 const CaveBiomeMapView = terrain.CaveBiomeMap.CaveBiomeMapView;
 const CaveMapView = terrain.CaveMap.CaveMapView;
-const GenerationMode = terrain.biomes.SimpleStructureModel.GenerationMode;
+const GenerationMode = terrain.structures.SimpleStructureModel.GenerationMode;
 const vec = main.vec;
 const Vec3d = vec.Vec3d;
 const Vec3f = vec.Vec3f;

src/server/terrain/simple_structures/FallenTree.zig

@@ -6,7 +6,7 @@ const ZonElement = main.ZonElement;
 const terrain = main.server.terrain;
 const CaveBiomeMapView = terrain.CaveBiomeMap.CaveBiomeMapView;
 const CaveMapView = terrain.CaveMap.CaveMapView;
-const GenerationMode = terrain.biomes.SimpleStructureModel.GenerationMode;
+const GenerationMode = terrain.structures.SimpleStructureModel.GenerationMode;
 const vec = main.vec;
 const Vec3d = vec.Vec3d;
 const Vec3f = vec.Vec3f;

src/server/terrain/simple_structures/FlowerPatch.zig

@@ -6,7 +6,7 @@ const ZonElement = main.ZonElement;
 const terrain = main.server.terrain;
 const CaveBiomeMapView = terrain.CaveBiomeMap.CaveBiomeMapView;
 const CaveMapView = terrain.CaveMap.CaveMapView;
-const GenerationMode = terrain.biomes.SimpleStructureModel.GenerationMode;
+const GenerationMode = terrain.structures.SimpleStructureModel.GenerationMode;
 const vec = main.vec;
 const Vec3d = vec.Vec3d;
 const Vec3f = vec.Vec3f;

src/server/terrain/simple_structures/GroundPatch.zig

@@ -6,7 +6,7 @@ const ZonElement = main.ZonElement;
 const terrain = main.server.terrain;
 const CaveBiomeMapView = terrain.CaveBiomeMap.CaveBiomeMapView;
 const CaveMapView = terrain.CaveMap.CaveMapView;
-const GenerationMode = terrain.biomes.SimpleStructureModel.GenerationMode;
+const GenerationMode = terrain.structures.SimpleStructureModel.GenerationMode;
 const vec = main.vec;
 const Vec3d = vec.Vec3d;
 const Vec3f = vec.Vec3f;

src/server/terrain/simple_structures/SbbGen.zig

@@ -3,7 +3,7 @@ const std = @import("std");
 const main = @import("main");
 const terrain = main.server.terrain;
 const Vec3i = main.vec.Vec3i;
-const GenerationMode = terrain.biomes.SimpleStructureModel.GenerationMode;
+const GenerationMode = terrain.structures.SimpleStructureModel.GenerationMode;
 const CaveMapView = terrain.CaveMap.CaveMapView;
 const CaveBiomeMapView = terrain.CaveBiomeMap.CaveBiomeMapView;
 const sbb = terrain.structure_building_blocks;

src/server/terrain/simple_structures/SimpleTreeModel.zig

@@ -6,7 +6,7 @@ const ZonElement = main.ZonElement;
 const terrain = main.server.terrain;
 const CaveBiomeMapView = terrain.CaveBiomeMap.CaveBiomeMapView;
 const CaveMapView = terrain.CaveMap.CaveMapView;
-const GenerationMode = terrain.biomes.SimpleStructureModel.GenerationMode;
+const GenerationMode = terrain.structures.SimpleStructureModel.GenerationMode;
 const vec = main.vec;
 const Vec3d = vec.Vec3d;
 const Vec3f = vec.Vec3f;

src/server/terrain/simple_structures/SimpleVegetation.zig

@@ -6,7 +6,7 @@ const ZonElement = main.ZonElement;
 const terrain = main.server.terrain;
 const CaveBiomeMapView = terrain.CaveBiomeMap.CaveBiomeMapView;
 const CaveMapView = terrain.CaveMap.CaveMapView;
-const GenerationMode = terrain.biomes.SimpleStructureModel.GenerationMode;
+const GenerationMode = terrain.structures.SimpleStructureModel.GenerationMode;
 const vec = main.vec;
 const Vec3d = vec.Vec3d;
 const Vec3f = vec.Vec3f;

src/server/terrain/simple_structures/Stalagmite.zig

@@ -6,7 +6,7 @@ const ZonElement = main.ZonElement;
 const terrain = main.server.terrain;
 const CaveBiomeMapView = terrain.CaveBiomeMap.CaveBiomeMapView;
 const CaveMapView = terrain.CaveMap.CaveMapView;
-const GenerationMode = terrain.biomes.SimpleStructureModel.GenerationMode;
+const GenerationMode = terrain.structures.SimpleStructureModel.GenerationMode;
 const vec = main.vec;
 const Vec3d = vec.Vec3d;
 const Vec3f = vec.Vec3f;

src/server/terrain/structuremapgen/SimpleStructureGen.zig

@@ -187,7 +187,7 @@ pub fn generate(map: *StructureMapFragment, worldSeed: u64) void {
 }
 
 const SimpleStructure = struct {
-	model: *const biomes.SimpleStructureModel,
+	model: *const terrain.structures.SimpleStructureModel,
 	seed: u64,
 	wx: i32,
 	wy: i32,

src/server/terrain/structures.zig

@@ -0,0 +1,73 @@
+const std = @import("std");
+
+const main = @import("main");
+const ZonElement = main.ZonElement;
+const NeverFailingAllocator = main.heap.NeverFailingAllocator;
+const ServerChunk = main.chunk.ServerChunk;
+const terrain = main.server.terrain;
+const Biome = main.server.terrain.biomes;
+
+pub const SimpleStructureModel = struct { // MARK: SimpleStructureModel
+	pub const GenerationMode = enum {
+		floor,
+		ceiling,
+		floor_and_ceiling,
+		air,
+		underground,
+		water_surface,
+	};
+	const VTable = struct {
+		loadModel: *const fn(parameters: ZonElement) ?*anyopaque,
+		generate: *const fn(self: *anyopaque, generationMode: GenerationMode, x: i32, y: i32, z: i32, chunk: *ServerChunk, caveMap: terrain.CaveMap.CaveMapView, biomeMap: terrain.CaveBiomeMap.CaveBiomeMapView, seed: *u64, isCeiling: bool) void,
+		hashFunction: *const fn(self: *anyopaque) u64,
+		generationMode: GenerationMode,
+	};
+
+	vtable: VTable,
+	data: *anyopaque,
+	chance: f32,
+	priority: f32,
+	generationMode: GenerationMode,
+
+	pub fn initModel(parameters: ZonElement) ?SimpleStructureModel {
+		const id = parameters.get([]const u8, "id", "");
+		const vtable = modelRegistry.get(id) orelse {
+			std.log.err("Couldn't find structure model with id {s}", .{id});
+			return null;
+		};
+		const vtableModel = vtable.loadModel(parameters) orelse {
+			std.log.err("Error occurred while loading structure with id '{s}'. Dropping model from biome.", .{id});
+			return null;
+		};
+		return SimpleStructureModel{
+			.vtable = vtable,
+			.data = vtableModel,
+			.chance = parameters.get(f32, "chance", 0.1),
+			.priority = parameters.get(f32, "priority", 1),
+			.generationMode = std.meta.stringToEnum(GenerationMode, parameters.get([]const u8, "generationMode", "")) orelse vtable.generationMode,
+		};
+	}
+
+	pub fn generate(self: SimpleStructureModel, x: i32, y: i32, z: i32, chunk: *ServerChunk, caveMap: terrain.CaveMap.CaveMapView, biomeMap: terrain.CaveBiomeMap.CaveBiomeMapView, seed: *u64, isCeiling: bool) void {
+		self.vtable.generate(self.data, self.generationMode, x, y, z, chunk, caveMap, biomeMap, seed, isCeiling);
+	}
+
+	var modelRegistry: std.StringHashMapUnmanaged(VTable) = .{};
+
+	pub fn registerGenerator(comptime Generator: type) void {
+		var self: VTable = undefined;
+		self.loadModel = main.utils.castFunctionReturnToOptionalAnyopaque(Generator.loadModel);
+		self.generate = main.utils.castFunctionSelfToAnyopaque(Generator.generate);
+		self.hashFunction = main.utils.castFunctionSelfToAnyopaque(struct {
+			fn hash(ptr: *Generator) u64 {
+				return Biome.hashGeneric(ptr.*);
+			}
+		}.hash);
+		self.generationMode = Generator.generationMode;
+		modelRegistry.put(main.globalArena.allocator, Generator.id, self) catch unreachable;
+	}
+
+	fn getHash(self: SimpleStructureModel) u64 {
+		return self.vtable.hashFunction(self.data);
+	}
+};

src/server/terrain/terrain.zig

@@ -6,6 +6,7 @@ const NeverFailingAllocator = main.heap.NeverFailingAllocator;
 
 pub const biomes = @import("biomes.zig");
 pub const noise = @import("noise/noise.zig");
+pub const structures = @import("structures.zig");
 const Biome = biomes.Biome;
 
 pub const ClimateMap = @import("ClimateMap.zig");