From a831a92232a4eccdf752b40a3e710d7e5fbf747b Mon Sep 17 00:00:00 2001
From: STP <adam.a.french@outlook.com>
Date: Tue, 28 Nov 2023 17:09:50 -0500
Subject: [PATCH] cleanup

---
 Cargo.toml  |  3 ++-
 src/gui.rs  | 34 +++++++++++++++++-----------------
 src/main.rs |  6 ++++--
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 5c6dbb6..d63513f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,13 +4,14 @@ version = "0.1.0"
 edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+
 [dependencies]
 cfg-if = "1"
 env_logger = "0.10"
 log = "0.4"
 pollster = "0.3"
 anyhow = "1.0"
-nalgebra = "0.32.3"
+nalgebra = {version = "0.32.3"}
 roots = "0.0.8"
 
 imgui = "0.11"
diff --git a/src/gui.rs b/src/gui.rs
index 2e7ccd6..97d10c8 100644
--- a/src/gui.rs
+++ b/src/gui.rs
@@ -24,12 +24,12 @@ const RAYS_MIN: i32 = 100;
 const RAYS_MAX: i32 = 10000;
 
 //MATERIAL CONSTANTS
-// const MIN_D: f32 = 0.0;
-// const MIN_S: f32 = 0.0;
-// const MIN_SHINE: f32 = 0.0;
-// const MAX_D: f32 = 1.0;
-// const MAX_S: f32 = 1.0;
-// const MAX_SHINE: f32 = 50.0;
+const MIN_D: f32 = 0.0;
+const MIN_S: f32 = 0.0;
+const MIN_SHINE: f32 = 0.0;
+const MAX_D: f32 = 1.0;
+const MAX_S: f32 = 1.0;
+const MAX_SHINE: f32 = 50.0;
 
 //TRANSFORMATION CONSTANTS
 const MIN_COLOUR: f32 = 0.0;
@@ -287,17 +287,17 @@ impl Gui {
                 }
             }
             // Edit materials
-            // if let Some(_t) = ui.tree_node("Materials") {
-            //     for (label, material) in &mut self.scene.materials {
-            //         if let Some(_t) = ui.tree_node(label) {
-            //             ui.slider_config("ks", MIN_D, MIN_D)
-            //                 .build_array(material.ks.as_mut_slice());
-            //             ui.slider_config("kd", MIN_S, MAX_S)
-            //                 .build_array(material.kd.as_mut_slice());
-            //             ui.slider("fov", MIN_SHINE, MAX_SHINE, &mut material.shininess);
-            //         }
-            //     }
-            // }
+            if let Some(_t) = ui.tree_node("Materials") {
+                for (label, material) in &mut self.scene.materials {
+                    if let Some(_t) = ui.tree_node(label) {
+                        ui.slider_config("ks", MIN_D, MAX_D)
+                            .build_array(material.ks.as_mut_slice());
+                        ui.slider_config("kd", MIN_S, MAX_S)
+                            .build_array(material.kd.as_mut_slice());
+                        ui.slider("shine", MIN_SHINE, MAX_SHINE, &mut material.shininess);
+                    }
+                }
+            }
             //Edit color, position and falloff of lights
             if let Some(_t) = ui.tree_node("Lights") {
                 for (label, light) in &mut self.scene.lights {
diff --git a/src/main.rs b/src/main.rs
index cea87e9..cd32429 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,19 +1,21 @@
 use crate::state::run;
 use error_iter::ErrorIter;
 
-const EPSILON: f64 = 1e-6;
+const EPSILON: f64 = 1e-8;
 const INFINITY: f64 = 1e-10;
 
 use log::error;
 use std::env;
 use std::error::Error;
 
+mod bvh;
 mod camera;
 mod gui;
 mod light;
+mod material;
+mod node;
 mod primitive;
 mod ray;
-mod raytracer;
 mod scene;
 mod state;