@@ -4,7 +4,7 @@

   :description "Describe 3dr here"

   :author "Your Name <your.name@example.com>"

   :license "Specify license here"

-  :depends-on (#:fwoar.lisputils

+  :depends-on (#:fwoar-lisputils

                #:alexandria

                #:serapeum

                #:lparallel)

@@ -10,11 +10,11 @@

   ((cells :initarg :cells :accessor cells :type (array integer (* *)))

    (distance :initarg :distance :accessor distance :type integer)))

-;(declaim (ftype (function ((vector integer 3) integer) (vector rational 3)) intercept-coordinate))

+;;(declaim (ftype (function ((vector integer 3) integer) (vector rational 3)) intercept-coordinate))

 (defun intercept-coordinate (point distance &optional out-point)

-  ;(declare (inline) (optimize (speed 3)))

+  (declare (inline) (optimize (speed 3)))

   (when (null out-point)

-    ;(break)

+                                        ;(break)

     (setf out-point (vector 0 0 0)))

   (let ((a (elt point 0)) (b (elt point 1)) (c (elt point 2)))

     (setf (elt out-point 0) distance)

@@ -23,7 +23,7 @@

     out-point))

 (defun run-plane (plane point-cb)

-  ;(declare (optimize (speed 3)))

+  (declare (optimize (speed 3)))

   (let ((a (distance plane))

         (points (cells plane)))

     (destructuring-bind (b-bound c-bound) (array-dimensions points)

@@ -84,12 +84,12 @@

              (point (or extracted-point (extract-projected-point point obj-dist out-point))))

         (let ((d_o (c-distance origin point)))

           (values (if (<= d_o radius)

-                    (ceiling (* (/ (sqrt (- r_sqr

-                                            (expt d_o

-                                                  2)))

-                                   radius)

-                                #. (expt 2 7))) 

-                    0)

+                      (ceiling (* (/ (sqrt (- r_sqr

+                                              (expt d_o

+                                                    2)))

+                                     radius)

+                                  #. (expt 2 7))) 

+                      0)

                   point))))))

 (defun make-interesting-cb (origin radius)

@@ -157,19 +157,19 @@

               finally (return val))))))

 (defun array-to-pgm (arr)

-  ;(declare (optimize (speed 3)))

+  ;;(declare (optimize (speed 3)))

   (with-output-to-string (s)

     (destructuring-bind (height width) (array-dimensions arr)

       (format s "P2~%~3d ~3d~%~d~%"

               width height

               (1+ (reduce #'max (make-array (* width height) :displaced-to arr)))))

     (loop with (x-bound y-bound) = (array-dimensions arr)

-          for x from 0 to (1- x-bound)

-          do (loop for y from 0 to (1- y-bound)

-                   for val = (aref arr x y)

-                   do (princ val s)

-                   do (princ #\space s))

-          do (terpri s))))

+       for x from 0 to (1- x-bound)

+       do (loop for y from 0 to (1- y-bound)

+             for val = (aref arr x y)

+             do (princ val s)

+             do (princ #\space s))

+       do (terpri s))))

 (defmacro defshape (render-func origin radius &rest args)

   `(make-instance 'shape

@@ -181,29 +181,31 @@

 (defun main (&rest args)

   (declare (ignore args))

   ;;(sb-profile:profile intercept-coordinate c-distance)

-  (let ((the-plane (make-instance 'plane

-                                  :cells (make-array '(512 512))

-                                  :distance 50))

-        (lparallel:*kernel* (lparallel:make-kernel 8)))

-

-    (labels ((100- (x) (- x 100))

-             (random-coord () (100- (random 200))))

-      (time

-        (run-plane the-plane

-          (apply #'combine-shapes

-                 (loop for _ from 0 to 100

-                            collect (defshape make-donut-cb

-                                        (vector (1+ (random 50))

-                                                (random-coord)

-                                                (random-coord))

-                                      (+ 3 (random 30))

-                                      3))))))

-

-    (with-open-file (s "/tmp/spheres.pgm" :direction :output :if-exists :supersede)

-      (write-sequence (array-to-pgm (cells the-plane))

-                      s))

-    nil)

-  ;(sb-profile:report)

+  (loop for img-num from 0 to 1

+     do

+       (let ((the-plane (make-instance 'plane

+                                       :cells (make-array '(1024 1024))

+                                       :distance 50))

+             (lparallel:*kernel* (lparallel:make-kernel 7)))

+

+         (labels ((100- (x) (- x 100))

+                  (random-coord () (100- (random 200))))

+           (time

+            (run-plane the-plane

+                       (apply #'combine-shapes

+                              (loop for x from 0 to 100 by 20

+                                 append (loop for y from 0 to 100 by 20

+                                           collect

+                                             (defshape make-sphere-cb

+                                                 (vector 30 x y)

+                                               10)))))))

+

+         (with-open-file (s (format nil "/tmp/spheres.~d.pgm" img-num)

+                            :direction :output :if-exists :supersede)

+           (write-sequence (array-to-pgm (cells the-plane))

+                           s))

+         nil))

+                                        ;(sb-profile:report)

   )

 ;(loop with (x-bound y-bound) = (array-dimensions (cells the-plane))