From a7a1b44548fac834ac9dd63559cca4d7e9c6de65 Mon Sep 17 00:00:00 2001
From: griffi-gh <prasol258@gmail.com>
Date: Fri, 27 Jan 2023 01:04:01 +0100
Subject: [PATCH] testing noise

---
 Cargo.toml            |  3 ++-
 src/world/tasks.rs    |  2 +-
 src/world/worldgen.rs | 29 ++++++++++++++++-------------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 833d37b..769fdad 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,9 +11,10 @@ env_logger = "0.10"
 strum = { version = "0.24", features = ["derive"] }
 glam = { version = "0.22", features = ["debug-glam-assert", "mint", "fast-math"] }
 hashbrown = "0.13"
-noise = "0.8"
 rayon = "1.6"
 shipyard = { version = "0.6", features = ["thread_local"] }
 nohash-hasher = "0.2.0"
 anyhow = "1.0"
 flume = "0.10"
+#once_cell = "1.17"
+bracket-noise = "0.8"
diff --git a/src/world/tasks.rs b/src/world/tasks.rs
index 9b921bc..6570829 100644
--- a/src/world/tasks.rs
+++ b/src/world/tasks.rs
@@ -10,7 +10,7 @@ use super::{
 
 pub enum ChunkTask {
   LoadChunk {
-    seed: u32,
+    seed: u64,
     position: IVec3
   },
   GenerateMesh {
diff --git a/src/world/worldgen.rs b/src/world/worldgen.rs
index a518bcd..c40716e 100644
--- a/src/world/worldgen.rs
+++ b/src/world/worldgen.rs
@@ -1,26 +1,29 @@
-use glam::IVec3;
+use glam::{IVec3, ivec3};
+use bracket_noise::prelude::*;
 use super::{
   chunk::{BlockData, CHUNK_SIZE},
   block::Block
 };
 
-pub fn generate_world(position: IVec3, _seed: u32) -> BlockData {
+pub fn generate_world(chunk_position: IVec3, seed: u64) -> BlockData {
+  let offset = chunk_position * CHUNK_SIZE as i32;
+  let mut noise = FastNoise::seeded(seed);
+  noise.set_fractal_type(FractalType::FBM);
+  noise.set_frequency(0.1);
+
   let mut blocks = Box::new([[[Block::Air; CHUNK_SIZE]; CHUNK_SIZE]; CHUNK_SIZE]);
-  //TODO actual world generation
-  if position.y == -1 {
-    for x in 0..CHUNK_SIZE {
+
+  for x in 0..CHUNK_SIZE {
+    for y in 0..CHUNK_SIZE {
       for z in 0..CHUNK_SIZE {
-        blocks[x][0][z] = Block::Grass;
-      }
-    }
-  } else if position.y < -1 {
-    for x in 0..CHUNK_SIZE {
-      for y in 0..CHUNK_SIZE {
-        for z in 0..CHUNK_SIZE {
-          blocks[x][y][z] = Block::Dirt;
+        let position = ivec3(x as i32, y as i32, z as i32) + offset;
+        let noise = noise.get_noise3d(position.x as f32, position.y as f32, position.z as f32);
+        if noise > 0.8 {
+          blocks[x][y][z] = Block::Stone;
         }
       }
     }
   }
+  
   blocks
 }