Commit: f2b642544a0a8ad2ab38de9723667a363e849eba - cammy (git)

A categorical programming language

Commit MetaInfo

• Revisión: f2b642544a0a8ad2ab38de9723667a363e849eba (tree)
• Tiempo: 2021-10-18 12:43:58
• Autor: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Multisample to antialias drawings.

Cambiar Resumen

• modified: hive/demo/mandelbrot.cammy
• modified: stub.scm

Diferencia incremental

--- a/hive/demo/mandelbrot.cammy
+++ b/hive/demo/mandelbrot.cammy
@@ -1,7 +1,7 @@
 (comp
   (comp
     (pair v2/mandelbrot (comp (fun/const f-zero) fun/dup))
-    fun/app-20)
+    fun/app-40)
   (comp
     (comp (pair v2/norm (fun/const f/2)) f-lt)
     (comp

--- a/stub.scm
+++ b/stub.scm
@@ -108,6 +108,24 @@
       (let ((w (modulo i width)) (h (/ i width)))
         (cons (sw (+ dw (* iw w))) (sh (+ dh (* ih h))))))))
 
+(define f-sum (fold f-zero f-add))
+(define (f-average xs) (/ (f-sum xs) (length xs)))
+
+(define ((multisample radius program) p)
+  (let*
+    ((px (car p))
+     (py (cdr p))
+     (c0 (program p))
+     (c1 (program (cons (+ px radius) py)))
+     (c2 (program (cons (- px radius) py)))
+     (c3 (program (cons px (+ py radius))))
+     (c4 (program (cons px (- py radius))))
+     (l (list c0 c1 c2 c3 c4))
+     (red (f-average (map car l)))
+     (blue (f-average (map (comp cdr car) l)))
+     (green (f-average (map (comp cdr cdr) l))))
+    (cons red (cons blue green))))
+
 (define (finish-channel c)
   (inexact->exact (round (* 255 (max 0.0 (min 1.0 c))))))
 
@@ -122,9 +140,10 @@
 (define (draw-png program filename window width height)
   (let*
     ((vp (viewport window width height))
-     (drawable (draw-pixel program vp))
      (size (* width height))
+     (radius 0.000001)
      (channels 3)
+     (drawable (draw-pixel (multisample radius program) vp))
      (pixels
        (do ((buf (make-u8vector (* size channels)))
             (i 0 (+ i 1)))