From 6cdd6b65d935a565da9989d67cd56a8a7a19fe7f Mon Sep 17 00:00:00 2001 From: Paul DeLong Date: Wed, 29 Jul 2015 17:56:46 -0400 Subject: [PATCH 1/4] [dev] reshuffling some priorities --- doc/ToDo.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/ToDo.md b/doc/ToDo.md index d3d5f69..a5f7f86 100644 --- a/doc/ToDo.md +++ b/doc/ToDo.md @@ -2,6 +2,9 @@ than the placeholder :red value I was using. Also, rename the test appropriately. + - [ ] add a command-line interface for passing options (particularly + for passing resolution arguments) + - [ ] I still find first-hit to be rather ugly. I'd like to abstract out bits of it, and make it easier to read. @@ -28,9 +31,6 @@ Again, this requires the scene description to be a hierarchical graph. - - [ ] add a command-line interface for passing options (particularly - for passing resolution arguments) - - [ ] add provisions for velocity coordinates, and relativistic effects (this would fall under the pie-in-the-sky category of feature additions, but it would be nice to finally do this) From 824f7d0f7e72a8e79f4b698947bba5997341b8bd Mon Sep 17 00:00:00 2001 From: Paul DeLong Date: Wed, 29 Jul 2015 18:22:54 -0400 Subject: [PATCH 2/4] [bugfix/2.0.1] fixed failing tests I forgot to modify the tests to handle three-component color, so naturally they failed. They are fixed now. --- test/toy_raytracer/core_test.clj | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/toy_raytracer/core_test.clj b/test/toy_raytracer/core_test.clj index ace63dd..1052c27 100644 --- a/test/toy_raytracer/core_test.clj +++ b/test/toy_raytracer/core_test.clj @@ -11,7 +11,7 @@ (def displacement-result (->Point -3.0 -3.0 -3.0)) -(def red-surface (->Surface :red)) +(def red-surface (->Surface (apply ->Color [1.0 0.0 0.0]))) (def red-sphere (->Sphere red-surface 5.0 dummy-point)) @@ -39,14 +39,14 @@ ;(deftest intersect-test ; (is (nil? (intersect red-sphere dummy-point dummy-ray))) ) -(def pixel (->Point 0 0 0)) +(def pixel (->Point 0.0 0.0 0.0)) -(def sphere-back (defsphere 1.0 200.0 [ 0.0 0.0 -1200.0])) -(def sphere-front (defsphere 1.0 200.0 [ 0.0 0.0 1200.0])) -(def sphere-bottom (defsphere 1.0 200.0 [ 0.0 -1200.0 0.0])) -(def sphere-top (defsphere 1.0 200.0 [ 0.0 1200.0 0.0])) -(def sphere-left (defsphere 1.0 200.0 [-1200.0 0.0 0.0])) -(def sphere-right (defsphere 1.0 200.0 [ 1200.0 0.0 0.0])) +(def sphere-back (defsphere 200.0 [ 0.0 0.0 -1200.0] [1.0 1.0 1.0])) +(def sphere-front (defsphere 200.0 [ 0.0 0.0 1200.0] [1.0 1.0 1.0])) +(def sphere-bottom (defsphere 200.0 [ 0.0 -1200.0 0.0] [1.0 1.0 1.0])) +(def sphere-top (defsphere 200.0 [ 0.0 1200.0 0.0] [1.0 1.0 1.0])) +(def sphere-left (defsphere 200.0 [-1200.0 0.0 0.0] [1.0 1.0 1.0])) +(def sphere-right (defsphere 200.0 [ 1200.0 0.0 0.0] [1.0 1.0 1.0])) (def dummy-world [ sphere-front From 1d7ed9ba8008ebbd0038250f09699f60a67afade Mon Sep 17 00:00:00 2001 From: Paul DeLong Date: Wed, 29 Jul 2015 18:26:23 -0400 Subject: [PATCH 3/4] [bugfix/2.0.1] crossed-off a ToDo item --- doc/ToDo.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/ToDo.md b/doc/ToDo.md index a5f7f86..4109274 100644 --- a/doc/ToDo.md +++ b/doc/ToDo.md @@ -1,7 +1,3 @@ - - [ ] Fix some of the initial tests to use a real color value, rather - than the placeholder :red value I was using. Also, rename the test - appropriately. - - [ ] add a command-line interface for passing options (particularly for passing resolution arguments) @@ -52,3 +48,7 @@ - [X] I currently mix floats and ints in my tests, rather arbitrarily. I need to normalize this. + + - [X] Fix some of the initial tests to use a real color value, rather + than the placeholder :red value I was using. Also, rename the test + appropriately. From b9b2f0e714ceff599b6095fce4c45d35c7d0b27e Mon Sep 17 00:00:00 2001 From: Paul DeLong Date: Wed, 29 Jul 2015 18:29:09 -0400 Subject: [PATCH 4/4] [bugfix/2.0.1] version bump --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index f803285..6989495 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject toy-raytracer "2.0.0" +(defproject toy-raytracer "2.0.1" :license {:name "MIT License"} :dependencies [[org.clojure/clojure "1.5.1"]] :main toy-raytracer.core )