Extensions for main loop (meshes, controllers, etc)

[gacela.git] / src / views.scm

diff --git a/src/views.scm b/src/views.scm
index 63c162a9d954e4b2a9238b7a7aaefbb721a74539..f8e93e282417b80184c6a88780a13621b47a4d7c 100644 (file)
--- a/src/views.scm
+++ b/src/views.scm
@@ -21,55 +21,137 @@
   #:use-module ((gacela gl) #:select (glPushMatrix glPopMatrix))
   #:use-module (ice-9 optargs))
 
+
+(define default-view (make-hash-table))
+
+(define* (draw-meshes #:optional (meshes (hash-map->list (lambda (k v) v) default-view)))
+  (cond ((not (null? meshes))
+        (catch #t
+                 (lambda () (mesh-draw (car meshes)))
+                 (lambda (key . args) #f))
+        (draw-meshes (cdr meshes)))))
+
+(add-extension! draw-meshes 50)
+
 (define-macro (define-view name content)
   `(begin
      (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)
-       (id (gensym)))
-    (let ((get-properties
-          (lambda ()
-            `((id . ,id) (x . ,x) (y . ,y) (z . ,z) (ax . ,ax) (ay . ,ay) (az . ,az) (rx . ,rx) (ry . ,ry) (rz . ,rz)))))
-      (lambda (option . params)
-       (case option
-         ((draw)
-          (video:glmatrix-block
-           (video:rotate rx ry rz)
-           (video:translate x y z)
-           (video:rotate ax ay az)
-           (primitive)))
-         ((translate)
-          (set! x (+ x (car params)))
-          (set! y (+ y (cadr params)))
-          (set! z (+ z (caddr params))))
-         ((get-properties)
-          (get-properties))
-         ((get-property)
-          (assoc-ref (get-properties) (car params))))))))
-
-(define* (show-mesh mesh #:optional (view default-view))
-  (let ((id (mesh 'get-property 'id)))
+(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-draw mesh)
+  (((record-accessor mesh-type 'draw) mesh)))
+
+(define (mesh-inner-property mesh prop-name)
+  (((record-accessor mesh-type 'inner-property) mesh) prop-name))
+
+(define (mesh-properties mesh)
+  (((record-accessor mesh-type 'properties) mesh)))
+
+(define (mesh-properties-set! mesh new-properties)
+  (((record-accessor mesh-type 'properties-set!) mesh) new-properties))
+
+(define* (show mesh #:optional (view default-view))
+  (let ((id (mesh-inner-property mesh 'id)))
     (if (not (hash-ref view id))
        (hash-set! view id mesh))))
 
-(define* (hide-mesh mesh #:optional (view default-view))
-  (hash-remove! view (mesh 'get-property 'id)))
+(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))))))
+        (let ((origin (caar symbols))
+              (dest (cadar symbols)))
+          `(begin
+             (define ,origin (primitive ,dest))
+             (define-primitives ,@(cdr symbols)))))))
 
 (define-primitives
   (rectangle video:draw-rectangle)