Minor fixes after #25

davids91 · Jun 14, 2024 · 6b41297 · 6b41297
1 parent c77d6a9
commit 6b41297
Show file tree

Hide file tree

Showing 4 changed files with 92 additions and 153 deletions.
diff --git a/benches/performance.rs b/benches/performance.rs
@@ -1,20 +1,20 @@
 use criterion::{criterion_group, criterion_main};
 use rand::Rng;
-use shocovox_rs::{octree::Octree, octree::V3c};
+use shocovox_rs::octree::{Octree, V3c};
 
 #[cfg(feature = "raytracing")]
-use shocovox_rs::octree::raytracing::Ray;
+use shocovox_rs::octree::{raytracing::Ray, Albedo};
 
 fn criterion_benchmark(c: &mut criterion::Criterion) {
     let mut rng = rand::thread_rng();
 
     #[cfg(feature = "raytracing")]
     {
         let tree_size = 512;
-        let mut tree = shocovox_rs::octree::Octree::<u32, 8>::new(tree_size)
+        let mut tree = shocovox_rs::octree::Octree::<Albedo, 8>::new(tree_size)
             .ok()
             .unwrap();
-        tree.insert(&V3c::new(1, 3, 3), rng.gen_range(0..500))
+        tree.insert(&V3c::new(1, 3, 3), rng.gen_range(0..500).into())
             .ok()
             .unwrap();
         for x in 0..100 {
@@ -25,7 +25,7 @@ fn criterion_benchmark(c: &mut criterion::Criterion) {
                         || z < (tree_size / 4)
                         || ((tree_size / 2) <= x && (tree_size / 2) <= y && (tree_size / 2) <= z)
                     {
-                        tree.insert(&V3c::new(x, y, z), rng.gen_range(0..500))
+                        tree.insert(&V3c::new(x, y, z), rng.gen_range(0..500).into())
                             .ok()
                             .unwrap();
                     }
@@ -74,7 +74,7 @@ fn criterion_benchmark(c: &mut criterion::Criterion) {
     }
 
     let tree_size = 64;
-    let mut tree = shocovox_rs::octree::Octree::<u32>::new(tree_size)
+    let mut tree = shocovox_rs::octree::Octree::<Albedo>::new(tree_size)
         .ok()
         .unwrap();
 
@@ -86,7 +86,7 @@ fn criterion_benchmark(c: &mut criterion::Criterion) {
                     rng.gen_range(0..tree_size),
                     rng.gen_range(0..tree_size),
                 ),
-                rng.gen_range(0..500),
+                rng.gen_range(0..500).into(),
             )
             .ok()
         });
@@ -122,7 +122,7 @@ fn criterion_benchmark(c: &mut criterion::Criterion) {
 
     c.bench_function("octree load", |b| {
         b.iter(|| {
-            let _tree_copy = Octree::<u32>::load("test_junk_octree").ok().unwrap();
+            let _tree_copy = Octree::<Albedo>::load("test_junk_octree").ok().unwrap();
         });
     });
 }

diff --git a/examples/cpu_render.rs b/examples/cpu_render.rs
@@ -14,29 +14,25 @@ fn main() {
     const TREE_SIZE: u32 = 64;
     let viewport_size_width = 128;
     let viewport_size_height = 128;
-    let mut tree = shocovox_rs::octree::Octree::<Albedo, MATRIX_DIMENSION>::new(tree_size)
+    let mut tree = shocovox_rs::octree::Octree::<Albedo, MATRIX_DIMENSION>::new(TREE_SIZE)
         .ok()
         .unwrap();
 
     tree.insert(&V3c::new(1, 3, 3), voxel_color)
         .expect("insert of voxel to work");
-    for x in 0..tree_size {
-        for y in 0..tree_size {
-            for z in 0..tree_size {
-                if ((x < (ARRAY_DIMENSION / 4)
-                    || y < (ARRAY_DIMENSION / 4)
-                    || z < (ARRAY_DIMENSION / 4))
+    for x in 0..TREE_SIZE {
+        for y in 0..TREE_SIZE {
+            for z in 0..TREE_SIZE {
+                if ((x < (TREE_SIZE / 4) || y < (TREE_SIZE / 4) || z < (TREE_SIZE / 4))
                     && (0 == x % 2 && 0 == y % 4 && 0 == z % 2))
-                    || ((ARRAY_DIMENSION / 2) <= x
-                        && (ARRAY_DIMENSION / 2) <= y
-                        && (ARRAY_DIMENSION / 2) <= z)
+                    || ((TREE_SIZE / 2) <= x && (TREE_SIZE / 2) <= y && (TREE_SIZE / 2) <= z)
                 {
                     tree.insert(
                         &V3c::new(x, y, z),
                         Albedo::default()
-                            .with_red((255 as f32 * x as f32 / tree_size as f32) as u8)
-                            .with_green((255 as f32 * y as f32 / tree_size as f32) as u8)
-                            .with_blue((255 as f32 * z as f32 / tree_size as f32) as u8)
+                            .with_red((255 as f32 * x as f32 / TREE_SIZE as f32) as u8)
+                            .with_green((255 as f32 * y as f32 / TREE_SIZE as f32) as u8)
+                            .with_blue((255 as f32 * z as f32 / TREE_SIZE as f32) as u8)
                             .with_alpha(255),
                     )
                     .ok()

diff --git a/src/octree/mod.rs b/src/octree/mod.rs
@@ -8,7 +8,7 @@ pub mod update;
 pub mod raytracing;
 
 pub use crate::spatial::math::vector::V3c;
-pub use types::{Octree, VoxelData};
+pub use types::{Albedo, Octree, VoxelData};
 
 use crate::object_pool::{empty_marker, ObjectPool};
 use crate::octree::{