Introducing bricks.

[gacela.git] / src / gacela.scm

diff --git a/src/gacela.scm b/src/gacela.scm
index ab0748b722e863e364b9ef819b21aec3729dcb3e..cf72902541cd0c521fd79308a7c9917ce1017df4 100644 (file)
--- a/src/gacela.scm
+++ b/src/gacela.scm
@@ -18,11 +18,10 @@
 (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 (load-texture
-           load-font
-           *title*
+  #:export (*title*
            *width-screen*
            *height-screen*
            *bpp-screen*
@@ -52,59 +51,11 @@
                   define-mob
                   lambda-mob
                   define-checking-mobs)
-  #:re-export (get-current-color
-              set-current-color
-              with-color
-              progn-textures
-              draw
-              draw-texture
-              draw-line
-              draw-quad
-              draw-rectangle
-              draw-square
-              draw-cube
-              translate
-              rotate
-              to-origin
-              add-light
-              set-camera
-              camera-look
-              render-text
+  #:re-export (translate
               get-frame-time
-              key?
-              key-pressed?
-              key-released?
               3d-mode?))
 
 
-;;; Resources Cache
-
-(define resources-cache (make-weak-value-hash-table))
-
-(define (from-cache key)
-  (hash-ref resources-cache key))
-
-(define (into-cache key res)
-  (hash-set! resources-cache key res))
-
-(define-macro (use-cache-with module proc)
-  (let ((pwc (string->symbol (string-concatenate (list (symbol->string proc) "-without-cache")))))
-    `(begin
-       (define ,pwc (@ ,module ,proc))
-       (define (,proc . param)
-        (let* ((key param)
-               (res (from-cache key)))
-          (cond (res
-                 res)
-                (else
-                 (set! res (apply ,pwc param))
-                 (into-cache key res)
-                 res)))))))
-
-(use-cache-with (gacela video) load-texture)
-(use-cache-with (gacela video) load-font)
-
-
 ;;; Main Loop
 
 (define loop-flag #f)
@@ -179,6 +130,7 @@
                           (lambda () (game-code))
                           (lambda (key . args) #f)))
                (run-mobs)
+               (draw-bricks)
                (flip-screen)
                (delay-frame))))
   (quit-video))
@@ -201,8 +153,9 @@
 (define *bpp-screen* 32)
 (define *frames-per-second* 20)
 (define *mode* '2d)
+(define *fullscreen* 'off)
 
-(define* (set-game-properties! #:key title width height bpp fps mode)
+(define* (set-game-properties! #:key title width height bpp fps mode fullscreen)
   (if title
       (set-screen-title! title))
   (if bpp
@@ -216,10 +169,12 @@
       (set-frames-per-second! fps))
   (if mode
       (if (eq? mode '3d) (set-3d-mode) (set-2d-mode)))
+  (if fullscreen
+      (set-fullscreen! fullscreen))
   (get-game-properties))
 
 (define (get-game-properties)
-  `((title . ,(get-screen-title)) (width . ,(get-screen-width)) (height . ,(get-screen-height)) (bpp . ,(get-screen-bpp)) (fps . ,(get-frames-per-second)) (mode . ,(if (3d-mode?) '3d '2d))))
+  `((title . ,(get-screen-title)) (width . ,(get-screen-width)) (height . ,(get-screen-height)) (bpp . ,(get-screen-bpp)) (fps . ,(get-frames-per-second)) (mode . ,(if (3d-mode?) '3d '2d)) (fullscreen . ,(get-fullscreen))))
 
 
 ;;; Mobs Factory
@@ -340,7 +295,7 @@
                 (else
                  (set! ,mob-id-z-index (+ ,mob-id-z-index z))
                  (translate-mob x y))))
-        (let ,attr
+        (let* ,attr
           ,@(map
              (lambda (a)
                `(let ((val (assoc-ref ,data-symbol ',(car a))))
@@ -396,3 +351,36 @@
 (define-macro (define-scene name . body)
   `(define (,name)
      ,@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)))
+
+
+;;; Primitive bricks
+
+(define (draw-square . args)
+  (simple-brick (apply video:draw-square args)))
+
+
+(module-map (lambda (sym var)
+             (if (not (eq? sym '%module-public-interface))
+                 (module-export! (current-module) (list sym))))
+           (current-module))