Views and meshes playing together

[gacela.git] / src / views.scm

diff --git a/src/views.scm b/src/views.scm
index b86af82b70854ccf1099d9dc7078c086f724f1d4..2fc44a873e5ce1394e6236f5ac28880e697b58b3 100644 (file)
--- a/src/views.scm
+++ b/src/views.scm
@@ -22,19 +22,56 @@
   #:use-module (ice-9 optargs))
 
 
-(define default-view (make-hash-table))
+;;; Views
 
-(define* (draw-meshes #:optional (meshes (hash-map->list (lambda (k v) v) default-view)))
+(define view-type
+  (make-record-type "view" 
+                   '(id controllers meshes priority)
+                   (lambda (record port)
+                     (format port "#<view: ~a controllers / ~a meshes>"
+                             (length (hash-map->list (lambda x x) (view-controllers record)))
+                             (length (hash-map->list (lambda x x) (view-meshes record)))))))
+
+(define* (make-view #:optional (priority 0)) ((record-constructor view-type) (gensym) (make-hash-table) (make-hash-table) priority))
+(define view? (record-predicate view-type))
+(define view-id (record-accessor view-type 'id))
+(define view-controllers (record-accessor view-type 'controllers))
+(define view-meshes (record-accessor view-type 'meshes))
+(define view-priority (record-accessor view-type 'priority))
+
+(define activated-views '())
+(define (sort-views views-alist)
+  (sort views-alist
+       (lambda (v1 v2)
+         (< (view-priority (cdr v1)) (view-priority (cdr v2))))))
+
+(define (activate-view view)
+  (set! activated-views
+       (sort-views (assoc-set! activated-views (view-id view) view)))
+  view)
+
+(define (view-actived? view)
+  (and (assoc (view-id view) activated-views) #t))
+
+(define (view-priority-set! view priority)
+  ((record-modifier view-type 'priority) view priority)
+  (set! activated-views (sort-views activated-views)))
+
+(define* (run-views #:optional (views activated-views))
+  (cond ((not (null? views))
+        ; controllers go here
+        (draw-meshes (hash-map->list (lambda (k v) v) (view-meshes (cdar views))))
+        (run-views (cdr views)))))
+
+(define (draw-meshes meshes)
   (cond ((not (null? meshes))
         (catch #t
                  (lambda () (mesh-draw (car meshes)))
                  (lambda (key . args) #f))
         (draw-meshes (cdr meshes)))))
 
-(define-macro (define-view name content)
-  `(begin
-     (hash-set! active-views ',name (lambda () (video:glmatrix-block ,content)))
-     ',name))
+
+(define default-view (activate-view (make-view)))
 
 
 ;;; Meshes
@@ -51,16 +88,15 @@
                      (display ">" port))))
                      
 
-(define mesh-constructor (record-constructor mesh-type))
 (define mesh? (record-predicate mesh-type))
 
-(define* (mesh proc #:optional mesh-type)
+(define* (make-mesh proc #:optional type)
   (apply
-   mesh-constructor
+   (record-constructor mesh-type)
    (let ((px 0) (py 0) (pz 0)
         (ax 0) (ay 0) (az 0)
         (rx 0) (ry 0) (rz 0)
-        (id (gensym)) (type mesh-type)
+        (id (gensym))
         (properties '()))
      (let ((inner-properties
            (lambda ()
@@ -129,12 +165,14 @@
   (((record-accessor mesh-type 'property-set!) mesh) prop-name value))
 
 (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))))
+  (let ((id (mesh-inner-property mesh 'id))
+       (table (view-meshes view)))
+    (if (not (hash-ref table id))
+       (hash-set! table id mesh))))
 
 (define* (hide mesh #:optional (view default-view))
-  (hash-remove! view (mesh-inner-property mesh 'id)))
+  (let ((table (view-meshes view)))
+    (hash-remove! table (mesh-inner-property mesh 'id))))
 
 (define* (translate mesh x y #:optional (z 0))
   (((record-accessor mesh-type 'translate) mesh) x y z)
@@ -157,9 +195,9 @@
 
 ;;; Primitives
 
-(defmacro* primitive (proc #:optional type)
+(defmacro* define-primitive (proc #:optional type)
   `(lambda (. params)
-     (let ((m (mesh (lambda (props) (apply ,proc ((@ (gacela utils) arguments-apply) ,proc props))) ,type)))
+     (let ((m (make-mesh (lambda (props) (apply ,proc ((@ (gacela utils) arguments-apply) ,proc props))) ,type)))
        (mesh-properties-set! m ((@ (gacela utils) arguments-calling) ,proc params))
        m)))
 
@@ -170,7 +208,7 @@
         (let ((origin (caar symbols))
               (dest (cadar symbols)))
           `(begin
-             (define ,origin (primitive ,dest ',origin))
+             (define ,origin (define-primitive ,dest ',origin))
              (define-primitives ,@(cdr symbols)))))))
 
 (define-primitives
@@ -185,4 +223,4 @@
 
 
 ;;; Adding extensions to the main loop
-(add-extension! draw-meshes 50)
+(add-extension! run-views 10)