Chunkify and winter cleanup (#13)

- Removed gaiku 2d references - Added Chunkify and ChunkifyMut - Added rustfmt - Replaced mod with named files - Removed unneeded deps - Runned clippy
norman784 · Jan 11, 2021 · b766561 · b766561
1 parent 43ea3c5
commit b766561
Show file tree

Hide file tree

Showing 35 changed files with 1,947 additions and 1,985 deletions.
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
@@ -23,7 +23,7 @@ jobs:
       with:
         toolchain: nightly
         token: ${{ secrets.GITHUB_TOKEN }}
-        args: +--features=empty -Zpackage-features
+        args: --features=empty -Zpackage-features
 
   check_fmt:
     name: Rust-fmt

diff --git a/Readme.md b/Readme.md
@@ -2,7 +2,8 @@
 
 ![Rust](https://github.com/norman784/gaiku/workflows/Rust/badge.svg)
 
-[2d](gaiku-2d) and [3d](gaiku-3d) agnostic framework (game engine) terrain engine. The purpose of the Gaiku is to provide a 
+[3d](gaiku-3d) agnostic framework (game engine) terrain engine. The purpose of the Gaiku is to provide a 
+
 foundation to build your games easily without worrying about implementing your own terrain engine.
 
 The main crate is developed game engine agnostic, so we can help to reach more developers.
@@ -25,9 +26,7 @@ General features:
 - Chunk based for infinite generated terrains
 - Mesh optimization
 - LOD support
-- For procedural terrain generation check the 2d and 3d `Bakers` documentations.
-
-For specific features check [2d](gaiku-2d/Readme.md) and [3d](gaiku-3d/Readme.md)
+- For procedural terrain generation check the 3d `Baker` documentation.
 
 ## Examples
 

diff --git a/gaiku-2d/Cargo.toml b/gaiku-2d/Cargo.toml
diff --git a/gaiku-2d/Readme.md b/gaiku-2d/Readme.md
diff --git a/gaiku-2d/example/Cargo.toml b/gaiku-2d/example/Cargo.toml
diff --git a/gaiku-2d/example/src/main.rs b/gaiku-2d/example/src/main.rs
diff --git a/gaiku-2d/src/lib.rs b/gaiku-2d/src/lib.rs
diff --git a/gaiku-3d/benches/benchmarks/heightmap.rs b/gaiku-3d/benches/benchmarks/heightmap.rs
@@ -1,68 +1,68 @@
 use criterion::{criterion_group, Criterion};
 use gaiku_3d::{
-    bakers::HeightMapBaker,
-    common::{Baker, Chunk, FileFormat},
-    formats::GoxReader,
+  bakers::HeightMapBaker,
+  common::{Baker, Chunk, Chunkify, FileFormat},
+  formats::GoxReader,
 };
 
 fn get_chunks(name: &str) -> Vec<Chunk> {
-    let file = format!(
-        "{}/examples/assets/{}.gox",
-        env!("CARGO_MANIFEST_DIR"),
-        name
-    );
+  let file = format!(
+    "{}/examples/assets/{}.gox",
+    env!("CARGO_MANIFEST_DIR"),
+    name
+  );
 
-    GoxReader::read(&file)
+  GoxReader::read(&file)
 }
 
 fn heightmap_benchmark(c: &mut Criterion) {
-    let mut group = c.benchmark_group("HeightMap");
-    let chunks = get_chunks("terrain");
+  let mut group = c.benchmark_group("HeightMap");
+  let chunks = get_chunks("terrain");
 
-    group.bench_function("Terrain", |b| {
-        b.iter(|| {
-            let mut meshes = vec![];
+  group.bench_function("Terrain", |b| {
+    b.iter(|| {
+      let mut meshes = vec![];
 
-            for chunk in chunks.iter() {
-                let mesh = HeightMapBaker::bake(chunk);
-                if let Some(mesh) = mesh {
-                    meshes.push((mesh, chunk.position()));
-                }
-            }
-        })
-    });
+      for chunk in chunks.iter() {
+        let mesh = HeightMapBaker::bake(chunk);
+        if let Some(mesh) = mesh {
+          meshes.push((mesh, chunk.position()));
+        }
+      }
+    })
+  });
 
-    let chunks = get_chunks("planet");
+  let chunks = get_chunks("planet");
 
-    group.bench_function("Planet", |b| {
-        b.iter(|| {
-            let mut meshes = vec![];
+  group.bench_function("Planet", |b| {
+    b.iter(|| {
+      let mut meshes = vec![];
 
-            for chunk in chunks.iter() {
-                let mesh = HeightMapBaker::bake(chunk);
-                if let Some(mesh) = mesh {
-                    meshes.push((mesh, chunk.position()));
-                }
-            }
-        })
-    });
+      for chunk in chunks.iter() {
+        let mesh = HeightMapBaker::bake(chunk);
+        if let Some(mesh) = mesh {
+          meshes.push((mesh, chunk.position()));
+        }
+      }
+    })
+  });
 
-    let chunks = get_chunks("small_tree");
+  let chunks = get_chunks("small_tree");
 
-    group.bench_function("Small tree", |b| {
-        b.iter(|| {
-            let mut meshes = vec![];
+  group.bench_function("Small tree", |b| {
+    b.iter(|| {
+      let mut meshes = vec![];
 
-            for chunk in chunks.iter() {
-                let mesh = HeightMapBaker::bake(chunk);
-                if let Some(mesh) = mesh {
-                    meshes.push((mesh, chunk.position()));
-                }
-            }
-        })
-    });
+      for chunk in chunks.iter() {
+        let mesh = HeightMapBaker::bake(chunk);
+        if let Some(mesh) = mesh {
+          meshes.push((mesh, chunk.position()));
+        }
+      }
+    })
+  });
 
-    group.finish();
+  group.finish();
 }
 
 criterion_group!(benches, heightmap_benchmark);
diff --git a/gaiku-3d/benches/benchmarks/marching_cubes.rs b/gaiku-3d/benches/benchmarks/marching_cubes.rs
@@ -1,68 +1,68 @@
 use criterion::{criterion_group, Criterion};
 use gaiku_3d::{
-    bakers::MarchingCubesBaker,
-    common::{Baker, Chunk, FileFormat},
-    formats::GoxReader,
+  bakers::MarchingCubesBaker,
+  common::{Baker, Chunk, Chunkify, FileFormat},
+  formats::GoxReader,
 };
 
 fn get_chunks(name: &str) -> Vec<Chunk> {
-    let file = format!(
-        "{}/examples/assets/{}.gox",
-        env!("CARGO_MANIFEST_DIR"),
-        name
-    );
+  let file = format!(
+    "{}/examples/assets/{}.gox",
+    env!("CARGO_MANIFEST_DIR"),
+    name
+  );
 
-    GoxReader::read(&file)
+  GoxReader::read(&file)
 }
 
 fn marching_cubes_benchmark(c: &mut Criterion) {
-    let mut group = c.benchmark_group("Marching cubes");
-    let chunks = get_chunks("terrain");
+  let mut group = c.benchmark_group("Marching cubes");
+  let chunks = get_chunks("terrain");
 
-    group.bench_function("Terrain", |b| {
-        b.iter(|| {
-            let mut meshes = vec![];
+  group.bench_function("Terrain", |b| {
+    b.iter(|| {
+      let mut meshes = vec![];
 
-            for chunk in chunks.iter() {
-                let mesh = MarchingCubesBaker::bake(chunk);
-                if let Some(mesh) = mesh {
-                    meshes.push((mesh, chunk.position()));
-                }
-            }
-        })
-    });
+      for chunk in chunks.iter() {
+        let mesh = MarchingCubesBaker::bake(chunk);
+        if let Some(mesh) = mesh {
+          meshes.push((mesh, chunk.position()));
+        }
+      }
+    })
+  });
 
-    let chunks = get_chunks("planet");
+  let chunks = get_chunks("planet");
 
-    group.bench_function("Planet", |b| {
-        b.iter(|| {
-            let mut meshes = vec![];
+  group.bench_function("Planet", |b| {
+    b.iter(|| {
+      let mut meshes = vec![];
 
-            for chunk in chunks.iter() {
-                let mesh = MarchingCubesBaker::bake(chunk);
-                if let Some(mesh) = mesh {
-                    meshes.push((mesh, chunk.position()));
-                }
-            }
-        })
-    });
+      for chunk in chunks.iter() {
+        let mesh = MarchingCubesBaker::bake(chunk);
+        if let Some(mesh) = mesh {
+          meshes.push((mesh, chunk.position()));
+        }
+      }
+    })
+  });
 
-    let chunks = get_chunks("small_tree");
+  let chunks = get_chunks("small_tree");
 
-    group.bench_function("Small tree", |b| {
-        b.iter(|| {
-            let mut meshes = vec![];
+  group.bench_function("Small tree", |b| {
+    b.iter(|| {
+      let mut meshes = vec![];
 
-            for chunk in chunks.iter() {
-                let mesh = MarchingCubesBaker::bake(chunk);
-                if let Some(mesh) = mesh {
-                    meshes.push((mesh, chunk.position()));
-                }
-            }
-        })
-    });
+      for chunk in chunks.iter() {
+        let mesh = MarchingCubesBaker::bake(chunk);
+        if let Some(mesh) = mesh {
+          meshes.push((mesh, chunk.position()));
+        }
+      }
+    })
+  });
 
-    group.finish();
+  group.finish();
 }
 
 criterion_group!(benches, marching_cubes_benchmark);