Changing things.

[gacela.git] / src / gacela.scm

diff --git a/src/gacela.scm b/src/gacela.scm
index 7e96a808700204c15003647a28c6a434b9fe196d..70ac867c2b995108b5ed2a188f043d173c6c84dd 100644 (file)
--- a/src/gacela.scm
+++ b/src/gacela.scm
@@ -18,7 +18,6 @@
 (define-module (gacela gacela)
   #:use-module (gacela events)
   #:use-module (gacela video)
-  #:use-module ((gacela video) #:renamer (symbol-prefix-proc 'video:))
   #:use-module (gacela audio)
   #:use-module (ice-9 optargs)
   #:export (*title*
@@ -119,7 +118,7 @@
                (to-origin)
                (refresh-active-mobs)
                (run-mobs)
-               (draw-bricks)
+               (draw-meshes)
                (flip-screen)
                (delay-frame))))
   (quit-video))
@@ -339,31 +338,16 @@
      ,@body))
 
 
-;;; Bricks Factory
+;;; Views Factory
 
-(define active-bricks '())
+(define default-view (make-hash-table))
 
-(define* (draw-bricks #:optional (bricks active-bricks))
-  (cond ((not (null? bricks))
-        ((car bricks))
-        (draw-bricks (cdr bricks)))))
-
-(define (show-brick brick)
-  (set! active-bricks (cons brick active-bricks)))
-
-(define-macro (simple-brick brick-code)
-  (let ((name (gensym)))
-    `(begin
-       (define (,name)
-        ,brick-code)
-       (show-brick ,name)
-       ,name)))
-
-
-;;; Primitive bricks
-
-(define (draw-square . args)
-  (simple-brick (apply video:draw-square args)))
+(define* (draw-meshes #:optional (meshes (hash-map->list (lambda (k v) v) default-view)))
+  (cond ((not (null? meshes))
+        (catch #t
+                 (lambda () ((car meshes) 'draw))
+                 (lambda (key . args) #f))
+        (draw-meshes (cdr meshes)))))
 
 
 (module-map (lambda (sym var)