From 77330df7c467cf70086c83c4095d85f9cd8a4b24 Mon Sep 17 00:00:00 2001 From: John Connors Date: Sun, 27 Jul 2008 20:41:48 +0100 Subject: [PATCH] Passed test again --- camera.lisp | 8 ++++---- test.lisp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/camera.lisp b/camera.lisp index 6c7a7f6..0f9bba8 100644 --- a/camera.lisp +++ b/camera.lisp @@ -6,16 +6,16 @@ (window :type rect)))) (defmethod window-left-of ((self camera)) - (aref (camera-window% self) 0)) + (aref (window-of% self) 0)) (defmethod window-right-of ((self camera)) - (aref (camera-window% self) 1)) + (aref (window-of% self) 1)) (defmethod window-top-of ((self camera)) - (aref (camera-window% self) 2)) + (aref (window-of% self) 2)) (defmethod window-bottom-of ((self camera)) - (aref (camera-window% self) 3)) + (aref (window-of% self) 3)) (defmethod window-width-of ((self camera)) (width (window-of self))) diff --git a/test.lisp b/test.lisp index 36e2420..68f6d03 100644 --- a/test.lisp +++ b/test.lisp @@ -91,7 +91,7 @@ (dump-image image #P"/home/johnc/projects/tuple-trace/out.png"))) (defun test-scene () - (let ((scene (make-scene (make-sphere 0.0 0.0 10.0 5.0))) + (let ((scene (make-scene (make-sphere "sphere001" 0.0 0.0 10.0 5.0))) (ray (make-ray 0.0 0.0 -10.0 -0.7031 0.5156 10.0))) (loop for primitive across (primitives-of scene) @@ -106,6 +106,6 @@ (defun test-trace () (let ((camera (make-camera 0.0 0.0 -10.0)) - (scene (make-scene (make-sphere 0.0 0.0 10.0 5.0))) + (scene (make-scene (make-sphere "sphere001" 0.0 0.0 10.0 5.0))) (image (make-image 320 200))) (render camera scene image))) \ No newline at end of file -- 2.11.4.GIT