Changing things.

[gacela.git] / src / gacela.scm

diff --git a/src/gacela.scm b/src/gacela.scm
index cf72902541cd0c521fd79308a7c9917ce1017df4..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*
@@ -34,7 +33,6 @@
            game-loop
            gacela-script
            game-running?
-           set-game-code
            show-mob-hash
            hide-mob-hash
            get-active-mobs
@@ -59,7 +57,6 @@
 ;;; Main Loop
 
 (define loop-flag #f)
-(define game-code #f)
 (define game-loop-thread #f)
 
 (define-macro (run-in-game-loop proc)
@@ -90,24 +87,19 @@
 (run-in-game-loop resize-screen)
 
 (define-macro (game . code)
-  `(let ((game-function ,(if (null? code)
-                            `(lambda () #f)
-                            `(lambda () ,@code))))
-     (set-game-code game-function)
-     (cond ((not (game-running?))
-           (game-loop)))))
+  (if (null? code)
+      #f
+      `(call-with-new-thread (lambda () ,@code))))
 
 (define (init-gacela)
   (hide-all-mobs)
-  (set-game-code (lambda () #f))
   (cond ((not game-loop-thread)
-        (set! game-loop-thread (call-with-new-thread (lambda () (game))))))
+        (set! game-loop-thread (call-with-new-thread (lambda () (cond ((not (game-running?)) (game-loop))))))))
   (while (not loop-flag))
   #t)
 
 (define (quit-gacela)
   (hide-all-mobs)
-  (set-game-code (lambda () #f))
   (set! game-loop-thread #f)
   (set! loop-flag #f))
 
@@ -125,12 +117,8 @@
                (clear-screen)
                (to-origin)
                (refresh-active-mobs)
-               (if (procedure? game-code)
-                   (catch #t
-                          (lambda () (game-code))
-                          (lambda (key . args) #f)))
                (run-mobs)
-               (draw-bricks)
+               (draw-meshes)
                (flip-screen)
                (delay-frame))))
   (quit-video))
@@ -141,9 +129,6 @@
 (define (game-running?)
   loop-flag)
 
-(define (set-game-code game-function)
-  (set! game-code game-function))
-
 
 ;;; Game Properties
 
@@ -353,31 +338,16 @@
      ,@body))
 
 
-;;; Bricks Factory
-
-(define active-bricks '())
-
-(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)))
+;;; Views Factory
 
+(define default-view (make-hash-table))
 
-;;; 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)