From 56fe70765f82451ea49a9c70c3599392be09ae42 Mon Sep 17 00:00:00 2001 From: griffi-gh Date: Thu, 2 May 2024 18:15:18 +0200 Subject: [PATCH] switch libs --- Cargo.lock | 44 +++++-------------- kubi-shared/Cargo.toml | 2 +- kubi-shared/src/worldgen.rs | 25 +++++++++++ kubi-shared/src/worldgen/_01_terrain.rs | 17 ++++---- kubi-shared/src/worldgen/_02_water.rs | 1 - kubi-shared/src/worldgen/_03_caves.rs | 56 +++++++++++++------------ 6 files changed, 75 insertions(+), 70 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 90612c1..ef609d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -236,30 +236,6 @@ dependencies = [ "objc2", ] -[[package]] -name = "bracket-noise" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b7443d0990c69db7a83f376f0101d684c20a911698e5f932bffbda2c8b08dd" -dependencies = [ - "bracket-random", -] - -[[package]] -name = "bracket-random" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "437be61484077b1ddb57002ce3c96b7d03cbf500b5d15157ee7e67e22332c39b" -dependencies = [ - "getrandom", - "js-sys", - "lazy_static", - "rand", - "rand_xorshift", - "regex", - "wasm-bindgen", -] - [[package]] name = "bumpalo" version = "3.16.0" @@ -633,6 +609,15 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "fastnoise-lite" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e5f3c3cc9081e5d0e18bcd50e80cd33cba47fc22f88a9da9c33ecd1c87ea5c0" +dependencies = [ + "num-traits", +] + [[package]] name = "fdeflate" version = "0.3.4" @@ -1243,8 +1228,8 @@ dependencies = [ "anyhow", "atomic", "bincode", - "bracket-noise", "bytemuck", + "fastnoise-lite", "glam", "hashbrown 0.14.3", "nohash-hasher", @@ -1688,15 +1673,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "rand_xorshift" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" -dependencies = [ - "rand_core", -] - [[package]] name = "rand_xoshiro" version = "0.6.0" diff --git a/kubi-shared/Cargo.toml b/kubi-shared/Cargo.toml index 63cf255..444bc73 100644 --- a/kubi-shared/Cargo.toml +++ b/kubi-shared/Cargo.toml @@ -14,7 +14,7 @@ serde = { version = "1.0", default-features = false, features = ["alloc", "deriv serde_with = "3.4" bincode = "1.3" anyhow = "1.0" -bracket-noise = "0.8" +fastnoise-lite = { version = "1.1", features = ["std", "f64"] } rand = { version = "0.8", default_features = false, features = ["std", "min_const_gen"] } rand_xoshiro = "0.6" hashbrown = { version = "0.14", features = ["serde"] } diff --git a/kubi-shared/src/worldgen.rs b/kubi-shared/src/worldgen.rs index 772aeb1..edfe938 100644 --- a/kubi-shared/src/worldgen.rs +++ b/kubi-shared/src/worldgen.rs @@ -23,6 +23,31 @@ pub enum AbortState { } const_assert!(Atomic::::is_lock_free()); +pub struct SeedThingy { + pseed: u64, + iseed: i32, + iter: u8, +} + +impl SeedThingy { + pub fn new(seed: u64) -> Self { + Self { + pseed: seed, + iseed: (seed & 0x7fffffffu64) as i32, + iter: 0, + } + } + + pub fn next_seed(&mut self) -> i32 { + self.iter += 1; + self.iseed = ( + self.pseed + .rotate_left((3 * self.iter) as _) + & 0x7fffffff + ) as i32; + self.iseed + } +} trait WorldGenStep { fn initialize(generator: &WorldGenerator) -> Self; fn generate(&mut self, generator: &mut WorldGenerator); diff --git a/kubi-shared/src/worldgen/_01_terrain.rs b/kubi-shared/src/worldgen/_01_terrain.rs index 9e21aa6..f5342a7 100644 --- a/kubi-shared/src/worldgen/_01_terrain.rs +++ b/kubi-shared/src/worldgen/_01_terrain.rs @@ -1,18 +1,19 @@ -use bracket_noise::prelude::{FastNoise, FractalType}; +use fastnoise_lite::{FastNoiseLite, FractalType}; use glam::ivec3; use crate::{block::Block, chunk::CHUNK_SIZE}; -use super::{WorldGenerator, WorldGenStep}; +use super::{SeedThingy, WorldGenStep, WorldGenerator}; pub struct TerrainStep { - noise: FastNoise, + noise: FastNoiseLite, } impl WorldGenStep for TerrainStep { fn initialize(generator: &WorldGenerator) -> Self { - let mut noise = FastNoise::seeded(generator.seed); - noise.set_fractal_type(FractalType::RigidMulti); - noise.set_fractal_octaves(5); - noise.set_frequency(0.003); + let mut seeder = SeedThingy::new(generator.seed); + let mut noise = FastNoiseLite::with_seed(seeder.next_seed()); + noise.set_fractal_type(Some(FractalType::FBm)); + noise.set_fractal_octaves(Some(4)); + noise.set_frequency(Some(0.003)); Self { noise } } @@ -20,7 +21,7 @@ impl WorldGenStep for TerrainStep { for x in 0..CHUNK_SIZE as i32 { for z in 0..CHUNK_SIZE as i32 { let global_xz = gen.global_position(ivec3(x, 0, z)); - let height = (self.noise.get_noise(global_xz.x as f32, global_xz.z as f32) * 32.0) as i32; + let height = (self.noise.get_noise_2d(global_xz.x as f64, global_xz.z as f64) * 32.0) as i32; for y in 0..gen.local_height(height) { gen.place(ivec3(x, y, z), Block::Stone); } diff --git a/kubi-shared/src/worldgen/_02_water.rs b/kubi-shared/src/worldgen/_02_water.rs index 136bc41..63c0b11 100644 --- a/kubi-shared/src/worldgen/_02_water.rs +++ b/kubi-shared/src/worldgen/_02_water.rs @@ -1,4 +1,3 @@ -use bracket_noise::prelude::{FastNoise, FractalType}; use glam::ivec3; use crate::{block::Block, chunk::CHUNK_SIZE}; use super::{WorldGenerator, WorldGenStep}; diff --git a/kubi-shared/src/worldgen/_03_caves.rs b/kubi-shared/src/worldgen/_03_caves.rs index f77d11a..a0ddd5a 100644 --- a/kubi-shared/src/worldgen/_03_caves.rs +++ b/kubi-shared/src/worldgen/_03_caves.rs @@ -1,42 +1,46 @@ -use bracket_noise::prelude::{FastNoise, FractalType}; + +use fastnoise_lite::{FastNoiseLite, FractalType}; use glam::{ivec3, IVec3}; use crate::{block::Block, chunk::CHUNK_SIZE}; -use super::{WorldGenStep, WorldGenerator}; +use super::{SeedThingy, WorldGenStep, WorldGenerator}; pub struct CaveStep { - a: FastNoise, - b: FastNoise, + a: FastNoiseLite, + b: FastNoiseLite, } impl WorldGenStep for CaveStep { fn initialize(gen: &WorldGenerator) -> Self { - let mut a = FastNoise::seeded(gen.seed); - a.set_fractal_type(FractalType::FBM); - a.set_frequency(0.015); + let mut seeder = SeedThingy::new(gen.seed); - let mut b = FastNoise::seeded(gen.seed.rotate_left(1) + 1); - b.set_fractal_type(FractalType::FBM); - b.set_frequency(0.015); + let mut a = FastNoiseLite::with_seed(seeder.next_seed()); + a.set_fractal_type(Some(FractalType::FBm)); + a.set_fractal_octaves(Some(2)); + + let mut b = FastNoiseLite::with_seed(seeder.next_seed()); + b.set_fractal_type(Some(FractalType::FBm)); + b.set_fractal_octaves(Some(2)); Self { a, b } } + fn generate(&mut self, gen: &mut WorldGenerator) { - for x in 0..CHUNK_SIZE as i32 { - for z in 0..CHUNK_SIZE as i32 { - for y in 0..CHUNK_SIZE as i32 { - let pos: IVec3 = ivec3(x, y, z); - if gen.query(pos) != Block::Stone { continue } + //TODO - let gpos = gen.global_position(pos); - let noise_a = self.a.get_noise3d(gpos.x as f32, gpos.y as f32, gpos.z as f32); - let noise_b = self.b.get_noise3d(gpos.x as f32, gpos.y as f32, gpos.z as f32); - let noise_min = noise_a.min(noise_b); - - if noise_min > 0.5 { return } - - //gen.place(ivec3(x, y, z), Block::Air); - } - } - } + // for x in 0..CHUNK_SIZE as i32 { + // for y in 0..CHUNK_SIZE as i32 { + // for z in 0..CHUNK_SIZE as i32 { + // let pos = ivec3(x, y, z); + // if gen.query(pos) != Block::Stone { continue } + // let pos_global = gen.global_position(pos); + // let noise_a = self.a.get_noise_3d(pos_global.x as f64, pos_global.y as f64, pos_global.z as f64) * 0.5 + 0.5; + // let noise_b = self.b.get_noise_3d(pos_global.x as f64, pos_global.y as f64, pos_global.z as f64) * 0.5 + 0.5; + // if noise_a.min(noise_b) > (1. - (-y as f32 / 400.).clamp(0., 1.)) { + // gen.place(pos, Block::Air); + // } + // //TODO + // } + // } + // } } }