Mesh Primitives Definition

[gacela.git] / src / views.scm

diff --git a/src/views.scm b/src/views.scm
index 06625778d0edb1e20d8536ae4c43c48a71ffc2a5..17f5e3f767cdcd7db5657c1e8a8f9da4fd32fa33 100644 (file)
--- a/src/views.scm
+++ b/src/views.scm
@@ -42,7 +42,7 @@
            (video:rotate ax ay az)
            (video:translate x y z)
            (video:rotate rx ry rz)
-           (primitive)))
+           (primitive properties)))
          ((translate)
           (set! x (+ x (car params)))
           (set! y (+ y (cadr params)))
@@ -61,18 +61,20 @@
           (assoc-ref (inner-properties) (car params)))
          ((properties)
           properties)
+         ((properties-set!)
+          (set! properties (car params)))
          ((property)
           (assoc-ref properties (car params)))
          ((property-set!)
           (set! properties (assoc-set! properties (car params) (cadr params)))))))))
 
 (define* (show mesh #:optional (view default-view))
-  (let ((id (mesh 'get-property 'id)))
+  (let ((id (mesh 'inner-property 'id)))
     (if (not (hash-ref view id))
        (hash-set! view id mesh))))
 
 (define* (hide mesh #:optional (view default-view))
-  (hash-remove! view (mesh 'get-property 'id)))
+  (hash-remove! view (mesh 'inner-property 'id)))
 
 (define* (translate mesh x y #:optional (z 0))
   (mesh 'translate x y z)
@@ -90,6 +92,15 @@
       (mesh 'rotate 0 0 (car params)))
   mesh)
 
+
+;;; Primitives
+
+(define-macro (primitive proc)
+  `(lambda (. params)
+     (let ((m (mesh (lambda (props) (apply ,proc ((@ (gacela utils) arguments-apply) ,proc props))))))
+       (m 'properties-set! ((@ (gacela utils) arguments-calling) ,proc params))
+       m)))
+
 (define-macro (define-primitives . symbols)
   (cond ((null? symbols)
         `#t)
@@ -97,9 +108,7 @@
         (let ((origin (caar symbols))
               (dest (cadar symbols)))
           `(begin
-             ,(if (and (list? origin) (list? dest))
-                  `(define* ,origin #f)
-                  `(define (,origin . params) (mesh (lambda () (apply ,dest params)))))
+             (define ,origin (primitive ,dest))
              (define-primitives ,@(cdr symbols)))))))
 
 (define-primitives