summaryrefslogtreecommitdiff
path: root/src/main.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/main.rs')
-rw-r--r--src/main.rs19
1 files changed, 16 insertions, 3 deletions
diff --git a/src/main.rs b/src/main.rs
index 3c67e9e..02efc49 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,19 +1,32 @@
mod view;
mod global;
mod calculus;
-mod renderer;
+mod camera;
mod object;
mod interval;
+use crate::calculus::calculus::Point3;
use crate::global::*;
-use crate::renderer::render;
+use crate::camera::Camera;
+use crate::object::{HittableList, Sphere};
use crate::view::{render_viewer, View};
fn main() {
let mut display_buffer: DisplayBuffer = [[Pixel::default(); IMG_WIDTH]; IMG_HEIGHT];
+ let mut world = HittableList::new();
+
+ world.push(
+ Sphere::new(Point3::new(0.0, 0.0, -1.0), 0.5)
+ );
+
+ world.push(
+ Sphere::new(Point3::new(0.0, -100.5, -1.0), 100.0)
+ );
+
+ let camera = Camera::new();
// test_render(&mut display_buffer);
- render(&mut display_buffer);
+ camera.render(&mut display_buffer, &world);
let view = View {