CactusMC/World
1
0
Fork 0
mirror of https://github.com/Cactus-minecraft-server/World.git synced 2025-12-07 10:40:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto commit

Browse Source
This commit is contained in:
Spectre
2025-02-23 12:43:56 +01:00
parent 6c6787c015
commit 823f258672
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib.rs
View File

@@ -1,6 +1,7 @@
use noise::{NoiseFn, Perlin}; use noise::{Fbm, MultiFractal, NoiseFn, Perlin};
/// Generates a 16x16 noise map for a given chunk, based on a seed and chunk coordinates. /// Generates a 16x16 noise map for a given chunk using fractal noise with multiple octaves
/// to avoid repetitive patterns.
/// ///
/// # Arguments /// # Arguments
/// - `seed`: A number influencing the noise generation (e.g., 42). /// - `seed`: A number influencing the noise generation (e.g., 42).
@@ -16,7 +17,8 @@ pub fn generate_normalized_noise_map(
chunk_z: i32, chunk_z: i32,
scale: f64, scale: f64,
) -> [[f64; 16]; 16] { ) -> [[f64; 16]; 16] {
let perlin = Perlin::new(seed); // Spécifier explicitement que Fbm utilise Perlin comme bruit de base
let fbm = Fbm::<Perlin>::new(seed).set_octaves(15);
let mut noise_map = [[0.0; 16]; 16]; let mut noise_map = [[0.0; 16]; 16];
// Define normalization range // Define normalization range
@@ -29,8 +31,8 @@ pub fn generate_normalized_noise_map(
let world_x = (chunk_x * 16 + x as i32) as f64 * scale; let world_x = (chunk_x * 16 + x as i32) as f64 * scale;
let world_z = (chunk_z * 16 + z as i32) as f64 * scale; let world_z = (chunk_z * 16 + z as i32) as f64 * scale;
// Generate Perlin noise value (between -1 and 1) // Generate fractal noise value (with multiple octaves)
let noise_value = perlin.get([world_x, world_z]); let noise_value = fbm.get([world_x, world_z]);
// Normalize noise from [-1,1] to [-64,324] // Normalize noise from [-1,1] to [-64,324]
let normalized_noise = (noise_value + 1.0) / 2.0 * (max_range - min_range) + min_range; let normalized_noise = (noise_value + 1.0) / 2.0 * (max_range - min_range) + min_range;
@@ -44,14 +46,14 @@ pub fn generate_normalized_noise_map(
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crate::generate_normalized_noise_map; use super::*;
#[test] #[test]
fn test_generate_normalized_noise_map() { fn test_generate_normalized_noise_map() {
let noise_map = generate_normalized_noise_map(456, 0, 0, 0.1); let noise_map = generate_normalized_noise_map(456, 0, 0, 0.1);
assert_eq!(noise_map.len(), 16); assert_eq!(noise_map.len(), 16);
for row in noise_map.iter() { for row in noise_map.iter() {
assert_eq!(row.len(), 16) assert_eq!(row.len(), 16);
} }
} }
} }

4
src/main.rs
View File

@@ -4,7 +4,7 @@ use worldgen::generate_normalized_noise_map; // Import rayon for parallel proces
fn main() { fn main() {
// Define parameters // Define parameters
let radius = 320; let radius = 300;
let chunk_size = 16; let chunk_size = 16;
let num_chunks = 2 * radius + 1; // number of chunks per dimension (65 here) let num_chunks = 2 * radius + 1; // number of chunks per dimension (65 here)
let img_width = num_chunks * chunk_size; let img_width = num_chunks * chunk_size;
@@ -19,7 +19,7 @@ fn main() {
let chunk_results: Vec<(i32, i32, [[f64; 16]; 16])> = chunk_coords let chunk_results: Vec<(i32, i32, [[f64; 16]; 16])> = chunk_coords
.into_par_iter() .into_par_iter()
.map(|(cx, cz)| { .map(|(cx, cz)| {
let noise_map = generate_normalized_noise_map(42, cx, cz, 0.01); let noise_map = generate_normalized_noise_map(42, cx, cz, 0.001);
(cx, cz, noise_map) (cx, cz, noise_map)
}) })
.collect(); .collect();