New picture mesh using resources cache

[gacela.git] / src / video.scm

diff --git a/src/video.scm b/src/video.scm
index 0e6a51345dfd9a6337a27a79bb7f83ad69e12f26..a9db7be0b7e03dce39f93e0c0bb611acbd9331a9 100644 (file)
--- a/src/video.scm
+++ b/src/video.scm
@@ -455,9 +455,7 @@
                    '(draw translate turn rotate inner-properties inner-property properties properties-set! property property-set!)
                    (lambda (record port)
                      (format port "#<mesh: ~a" (mesh-inner-property record 'type))
-                     (for-each (lambda (x)
-                                 (cond (((@ (gacela utils) bound?) (cdr x))
-                                        (format port " ~a" x))))
+                     (for-each (lambda (x) (format port " ~a" x))
                                (mesh-properties record))
                      (display ">" port))))
 
@@ -555,23 +553,51 @@
   mesh)
 
 
+;;; Advanced meshes
+
+(define (mesh-join . meshes)
+  (make-mesh
+   'joined-meshes
+   (lambda (props)
+     (for-each (lambda (m) (glmatrix-block (mesh-draw m))) meshes))))
+
+
 ;;; Primitives
 
-(define-macro (define-mesh header . body)
-  (let ((name (car header))
-       (args (cdr header)))
-    `(define* ,header
+(define-macro (primitive header . body)
+  (let* ((type (car header))
+        (args (cdr header))
+        (list-args (names-arguments args)))
+    `(lambda* ,args
        (let ((m (make-mesh
-                ',name
+                ',type
                 (lambda (props)
-                  (apply (lambda* ,args ,@body)
-                         ((@ (gacela utils) arguments-apply) ,name props))))))
-        (mesh-properties-set! m (list ,@(map (lambda (a) `(cons ',a ,a)) (names-arguments args))))
+                  (apply (lambda* ,(cons #:key list-args) ,@body)
+                         (list
+                          ,@(let get-params ((l list-args))
+                              (cond ((null? l) '())
+                                    (else
+                                     (cons (symbol->keyword (car l))
+                                           (cons `(assoc-ref props ',(car l))
+                                                 (get-params (cdr l)))))))))))))
+        (mesh-properties-set! m (list ,@(map (lambda (a) `(cons ',a ,a)) list-args)))
         m))))
 
-(define-mesh (square size #:key texture color)
+(define-macro (define-primitive header . body)
+  `(define ,(car header) (primitive ,header ,@body)))
+
+
+;;; Primitives definition
+
+(define-primitive (square size #:key texture color)
   (draw-square size #:texture texture #:color color))
 
+(define-primitive (rectangle width height #:key texture color texture-coord)
+  (draw-rectangle width height #:texture texture #:color color #:texture-coord texture-coord))
+
+(define-primitive (picture filename #:key (min-filter GL_LINEAR) (mag-filter GL_LINEAR) (zoom 1) (sprite '((0 0) (1 1))))
+  (draw-texture (load-texture filename #:min-filter min-filter #:mag-filter mag-filter) #:zoom zoom #:sprite sprite))
+
 
 (module-map (lambda (sym var)
              (if (not (eq? sym '%module-public-interface))