feat(raytracer): add native rt functions to lisp

src/bin/rt_demo.rs

@@ -3,10 +3,9 @@ use lispers::raytracer::{
     plane::Checkerboard,
     scene::Scene,
     sphere::Sphere,
-    types::{Color, Light, Material, Point3, Vector3},
+    types::{Color, Light, Material, Point3, RTObjectWrapper, Vector3},
 };
 extern crate nalgebra as na;
-use std::sync::Arc;
 use std::time::Instant;
 
 fn main() {
@@ -23,7 +22,7 @@ fn main() {
         color: Color::new(1.0, 1.0, 1.0),
     });
 
-    scene.add_object(Arc::new(Checkerboard::new(
+    scene.add_object(RTObjectWrapper::new(Box::new(Checkerboard::new(
         Point3::new(0.0, -1.0, 0.0),
         Vector3::new(0.0, 1.0, 0.0),
         Material::new(
@@ -42,9 +41,9 @@ fn main() {
         ),
         0.3,
         Vector3::new(0.0, 0.0, 1.0),
-    )));
+    ))));
 
-    scene.add_object(Arc::new(Sphere::new(
+    scene.add_object(RTObjectWrapper::new(Box::new(Sphere::new(
         Point3::new(-2.0, 0.0, 1.0),
         1.0,
         Material::new(
@@ -54,9 +53,9 @@ fn main() {
             20.0,
             0.3,
         ),
-    )));
+    ))));
 
-    scene.add_object(Arc::new(Sphere::new(
+    scene.add_object(RTObjectWrapper::new(Box::new(Sphere::new(
         Point3::new(0.2, -0.5, -0.2),
         0.5,
         Material::new(
@@ -66,9 +65,9 @@ fn main() {
             20.0,
             0.3,
         ),
-    )));
+    ))));
 
-    scene.add_object(Arc::new(Sphere::new(
+    scene.add_object(RTObjectWrapper::new(Box::new(Sphere::new(
         Point3::new(-0.5, 0.5, -2.0),
         1.5,
         Material::new(
@@ -78,7 +77,7 @@ fn main() {
             20.0,
             0.3,
         ),
-    )));
+    ))));
 
     let camera = Camera::new(
         Point3::new(0.0, 0.7, 5.0),

src/bin/rt_lisp_demo.rs

@@ -0,0 +1,46 @@
+use lispers::lisp::environment::EnvironmentLayer;
+use lispers::lisp::prelude::mk_prelude;
+use lispers::lisp::{eval, Environment};
+use lispers::parser::ExpressionStream;
+use lispers::raytracer::lisp::mk_raytrace;
+
+fn main() {
+    let programs = [
+        "(set 'blue (material (color 0 0 1) (color 0 0 1) (color 0 0 0.6) 50 0.25))",
+        "(set 'green (material (color 0 1 0) (color 0 1 0) (color 0 0.6 0) 50 0.25))",
+        "(set 'white (material (color 1 1 1) (color 1 1 1) (color 0.6 0.6 0.6) 100 0.5))",
+        "(set 'black (material (color 0 0 0) (color 0 0 0) (color 0.6 0.6 0.6) 100 0.5))",
+        "(set 's1 (sphere (point 0 1 0) 1 blue))",
+        "(set 's2 (sphere (point 2 0.5 2) 0.5 green))",
+        "(set 'p1 (checkerboard (point 0 0 0) (vector 0 1 0) black white 0.5 (vector 0.5 0 1)))",
+        "(set 'l1 (light (point 3 10 5) (color 1 1 1)))",
+        "(set 'l2 (light (point 2 10 5) (color 1 1 1)))",
+        "(set 'scn (scene (color 0.1 0.1 0.1) '(s1 s2 p1) '(l1 l2)))",
+        "(set 'cam (camera (point 0 3 6) (point 0 0 0) (vector 0 1 0) 40 1920 1080))",
+        "(render cam scn 5 4 \"rt-lisp-demo.png\")",
+    ];
+
+    let mut layer = EnvironmentLayer::new();
+    mk_prelude(&mut layer);
+    mk_raytrace(&mut layer);
+
+    let environment = Environment::from_layer(layer);
+
+    for r in ExpressionStream::from_char_stream(programs.iter().map(|p| p.chars()).flatten()) {
+        match r {
+            Err(err) => {
+                println!("ParserError: {:?}", err);
+                break;
+            }
+            Ok(expr) => {
+                println!("Evaluating: {}", expr.clone());
+                match eval(&environment, expr) {
+                    Ok(e) => println!("=> {}", e),
+                    Err(e) => println!("Error: {}", e),
+                }
+            }
+        }
+    }
+
+    println!("Interpreter Done!");
+}