Implementing meshes using records

[gacela.git] / src / views.scm

diff --git a/src/views.scm b/src/views.scm
index d658eafaf0786a28caa9344640bddf638e8e2fb7..9aa3006f54541bd4c33b3d390ef9d8ad75277e60 100644 (file)
--- a/src/views.scm
+++ b/src/views.scm
@@ -26,64 +26,113 @@
      (hash-set! active-views ',name (lambda () (video:glmatrix-block ,content)))
      ',name))
 
-(define (mesh primitive)
-  (let ((x 0) (y 0) (z 0)
-       (ax 0) (ay 0) (az 0)
-       (rx 0) (ry 0) (rz 0))
-    (lambda (option . params)
-      (case option
-       ((draw)
-        (video:glatrix-block
-         (video:rotate rx ry rz)
-         (video:translate x y z)
-         (video:rotate ax ay az)
-         (primitive)))
-       ((get-properties)
-        `((x . ,x) (y . ,y) (z . ,z) (ax . ,ax) (ay . ,ay) (az . ,az) (rx . ,rx) (ry . ,ry) (rz . ,rz)))))))
-
-(define-macro (define-mob mob-head . body)
-  (let* ((name (car mob-head))
-        (attr (cdr mob-head))
-        (make-fun-symbol (gensym))
-        (mob-fun-symbol (gensym))
-        (params-symbol (gensym)))
-    `(define (,name . ,params-symbol)
-       (define ,make-fun-symbol
-        (lambda* ,(if (null? attr) '() `(#:key ,@attr))
-          (the-mob ,name (list ,@(map (lambda (a) `(cons ',(car a) ,(car a))) attr)))))
-       (define ,mob-fun-symbol
-        (define-mob-function ,attr ,@body))
-       (cond ((or (null? ,params-symbol) (keyword? (car ,params-symbol)))
-             (apply ,make-fun-symbol ,params-symbol))
-            (else
-             (apply ,mob-fun-symbol ,params-symbol))))))
-
-
-(define-macro (define-mesh name . mesh)
-  (let* ((make-fun-symbol (gensym))
-        (mesh-fun-symbol (gensym))
-        (params-symbol (gensym)))
-    `(define ,name
-       (let ((,make-fun-symbol
-             (lambda ()))
-            (,mesh-fun-symbol
-             (lambda ())))
-        (lambda (. ,params-symbol)
-          (cond ((or (null? ,params-symbol) (keyword? (car ,params-symbol)))
-                 (apply ,make-fun-symbol ,params-symbol))
-                (else
-                 (apply ,mesh-fun-symbol ,params-symbol))))))))
-        
+(define mesh-type
+  (make-record-type "mesh" 
+                   '(draw translate turn rotate inner-properties inner-property properties properties-set! property property-set!)))
+
+(define mesh-constructor (record-constructor mesh-type))
+(define mesh? (record-predicate mesh-type))
+
+(define (mesh proc)
+  (apply
+   mesh-constructor
+   (let ((px 0) (py 0) (pz 0)
+        (ax 0) (ay 0) (az 0)
+        (rx 0) (ry 0) (rz 0)
+        (id (gensym))
+        (properties '()))
+     (let ((inner-properties
+           (lambda ()
+             `((id . ,id) (x . ,px) (y . ,py) (z . ,pz) (ax . ,ax) (ay . ,ay) (az . ,az) (rx . ,rx) (ry . ,ry) (rz . ,rz)))))
+       (list
+       (lambda ()
+         "draw"
+         (video:glmatrix-block
+          (video:rotate ax ay az)
+          (video:translate px py pz)
+          (video:rotate rx ry rz)
+          (proc properties)))
+       (lambda (x y z)
+         "translate"
+         (set! px (+ px x))
+         (set! py (+ py y))
+         (set! pz (+ pz z)))
+       (lambda (x y z)
+         "turn"
+         (set! ax (+ ax x))
+         (set! ay (+ ay y))
+         (set! az (+ az z)))
+       (lambda (x y z)
+         "rotate"
+         (set! rx (+ rx x))
+         (set! ry (+ ry y))
+         (set! rz (+ rz z)))
+       (lambda ()
+         "inner-properties"
+         (inner-properties))
+       (lambda (prop-name)
+         "inner-property"
+         (assoc-ref (inner-properties) prop-name))
+       (lambda ()
+         "properties"
+         properties)
+       (lambda (new-properties)
+         "properties-set!"
+         (set! properties new-properties))
+       (lambda (prop-name)
+         "property"
+         (assoc-ref properties prop-name))
+       (lambda (prop-name value)
+         "property-set!"
+         (set! properties (assoc-set! properties prop-name value))))))))
+
+(define mesh-properties-set!
+  (let ((f (record-accessor mesh-type 'properties-set!)))
+    (lambda (mesh new-properties)
+      ((f mesh) new-properties))))
+
+(define* (show mesh #:optional (view default-view))
+  (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 'inner-property 'id)))
+
+(define* (translate mesh x y #:optional (z 0))
+  (mesh 'translate x y z)
+  mesh)
+
+(define (turn mesh . params)
+  (if (>= (length params) 3)
+      (apply mesh (cons 'turn params))
+      (mesh 'turn 0 0 (car params)))
+  mesh)
+
+(define (rotate mesh . params)
+  (if (>= (length params) 3)
+      (apply mesh (cons 'rotate params))
+      (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))))))
+       (mesh-properties-set! m ((@ (gacela utils) arguments-calling) ,proc params))
+       m)))
 
 (define-macro (define-primitives . symbols)
   (cond ((null? symbols)
         `#t)
        (else
-        `(begin
-           (define (,(caar symbols) . params) (mesh (lambda () (apply ,(cadar symbols) params))))
-           (define-primitives ,@(cdr symbols))))))
-
-; (define-macro (,(caar symbols) . params) (let ((f ',(cadar symbols))) `(mesh (lambda () (apply ,f ',params)))))
+        (let ((origin (caar symbols))
+              (dest (cadar symbols)))
+          `(begin
+             (define ,origin (primitive ,dest))
+             (define-primitives ,@(cdr symbols)))))))
 
 (define-primitives
   (rectangle video:draw-rectangle)