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

Allow making less spherical trees with the leafElongation parameters.

Browse Source 
as proposed in https://github.com/PixelGuys/Cubyz/issues/893#issuecomment-2573743185
This commit is contained in:
IntegratedQuantum 2025-02-03 21:12:32 +01:00
parent f8a8d19759
commit b384ec9ed8
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/cubyz/biomes/grassland.zig.zon
View File

@ -25,6 +25,8 @@
.type = .round,
.height = 6,
.height_variation = 3,
.leafElongation = 1.0,
.deltaLeafElongation = 0.2,
},
.{
.id = "cubyz:boulder",

17
src/server/terrain/simple_structures/SimpleTreeModel.zig
View File

@ -30,6 +30,8 @@ height0: i32,
deltaHeight: u31,
leafRadius: f32,
deltaLeafRadius: f32,
leafElongation: f32,
deltaLeafElongation: f32,
branched: bool,
pub fn loadModel(arenaAllocator: NeverFailingAllocator, parameters: ZonElement) *SimpleTreeModel {
@ -46,6 +48,8 @@ pub fn loadModel(arenaAllocator: NeverFailingAllocator, parameters: ZonElement)
.deltaHeight = parameters.get(u31, "height_variation", 3),
.leafRadius = parameters.get(f32, "leafRadius", (1 + parameters.get(f32, "height", 6))/2),
.deltaLeafRadius = parameters.get(f32, "leafRadius_variation", parameters.get(f32, "height_variation", 3)/2),
.leafElongation = parameters.get(f32, "leafElongation", 1),
.deltaLeafElongation = parameters.get(f32, "deltaLeafElongation", 0),
.branched = parameters.get(bool, "branched", true),
};
return self;
@ -89,6 +93,7 @@ pub fn generate(self: *SimpleTreeModel, x: i32, y: i32, z: i32, chunk: *main.chu
const factor = random.nextFloat(seed);
var height = self.height0 + @as(i32, @intFromFloat(factor*@as(f32, @floatFromInt(self.deltaHeight))));
const leafRadius = self.leafRadius + factor*self.deltaLeafRadius;
const leafElongation: f32 = self.leafElongation + random.nextFloatSigned(seed)*self.deltaLeafElongation;
if(z + height >= caveMap.findTerrainChangeAbove(x, y, z)) // Space is too small.Allocator
return;
@ -126,17 +131,19 @@ pub fn generate(self: *SimpleTreeModel, x: i32, y: i32, z: i32, chunk: *main.chu
.round => {
self.generateStem(x, y, z, height, chunk, seed);
const ceilZRadius: i32 = @intFromFloat(@ceil(leafRadius*leafElongation));
const ceilRadius: i32 = @intFromFloat(@ceil(leafRadius));
const radiusSqr: i32 = @intFromFloat(leafRadius*leafRadius);
const randomRadiusSqr: i32 = @intFromFloat((leafRadius - 0.25)*(leafRadius - 0.25));
const radiusSqr: f32 = leafRadius*leafRadius;
const randomRadiusSqr: f32 = (leafRadius - 0.25)*(leafRadius - 0.25);
const invLeafElongationSqr = 1.0/(leafElongation*leafElongation);
const center = z + height;
var pz = chunk.startIndex(center - ceilRadius);
while(pz < center + ceilRadius) : (pz += chunk.super.pos.voxelSize) {
var pz = chunk.startIndex(center - ceilZRadius);
while(pz < center + ceilZRadius) : (pz += chunk.super.pos.voxelSize) {
var px = chunk.startIndex(x - ceilRadius);
while(px < x + ceilRadius) : (px += chunk.super.pos.voxelSize) {
var py = chunk.startIndex(y - ceilRadius);
while(py < y + ceilRadius) : (py += chunk.super.pos.voxelSize) {
const distSqr = (pz - center)*(pz - center) + (px - x)*(px - x) + (py - y)*(py - y);
const distSqr = @as(f32, @floatFromInt((pz - center)*(pz - center)))*invLeafElongationSqr + @as(f32, @floatFromInt((px - x)*(px - x) + (py - y)*(py - y)));
if(chunk.liesInChunk(px, py, pz) and distSqr < radiusSqr and (distSqr < randomRadiusSqr or random.nextInt(u1, seed) != 0)) { // TODO: Use another seed to make this more reliable!
chunk.updateBlockIfDegradable(px, py, pz, self.leavesBlock);
}