Main loop with recursivity

[gacela.git] / src / views.scm

diff --git a/src/views.scm b/src/views.scm
index 2fc44a873e5ce1394e6236f5ac28880e697b58b3..75f90713bd0150a1344bc2f7533c295c00437212 100644 (file)
--- a/src/views.scm
+++ b/src/views.scm
@@ -26,26 +26,38 @@
 
 (define view-type
   (make-record-type "view" 
-                   '(id controllers meshes priority)
+                   '(id constructor body 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)))))))
+                     (format port "#<view: ~a meshes>"
+                             (length (view-meshes record))))))
 
-(define* (make-view #:optional (priority 0)) ((record-constructor view-type) (gensym) (make-hash-table) (make-hash-table) priority))
+(define (build-view constructor) ((record-constructor view-type) (gensym) constructor #f '() 0))
 (define view? (record-predicate view-type))
 (define view-id (record-accessor view-type 'id))
-(define view-controllers (record-accessor view-type 'controllers))
+(define view-constructor (record-accessor view-type 'constructor))
+(define view-body (record-accessor view-type 'body))
+(define view-body-set! (record-modifier view-type 'body))
 (define view-meshes (record-accessor view-type 'meshes))
+(define view-meshes-set! (record-modifier view-type 'meshes))
 (define view-priority (record-accessor view-type 'priority))
 
+(define-macro (make-view body)
+  `(build-view (lambda () ,body)))
+
 (define activated-views '())
+
 (define (sort-views views-alist)
   (sort views-alist
        (lambda (v1 v2)
          (< (view-priority (cdr v1)) (view-priority (cdr v2))))))
 
+(define (reset-view! view)
+  (view-body-set! view ((view-constructor view)))
+  (view-meshes-set! view '())
+  (view-priority-set! view 0))
+
 (define (activate-view view)
+  (reset-view! view)
   (set! activated-views
        (sort-views (assoc-set! activated-views (view-id view) view)))
   view)
@@ -55,23 +67,27 @@
 
 (define (view-priority-set! view priority)
   ((record-modifier view-type 'priority) view priority)
-  (set! activated-views (sort-views activated-views)))
+  (if (view-actived? view)
+      (set! activated-views (sort-views activated-views))))
+
+(define current-view #f)
 
 (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))))
+        (set! current-view (cdar views))
+        ((view-body current-view))
+        (draw-meshes (view-meshes current-view))
         (run-views (cdr views)))))
 
 (define (draw-meshes meshes)
   (cond ((not (null? meshes))
         (catch #t
-                 (lambda () (mesh-draw (car meshes)))
+                 (lambda () (mesh-draw (cdar meshes)))
                  (lambda (key . args) #f))
         (draw-meshes (cdr meshes)))))
 
 
-(define default-view (activate-view (make-view)))
+(define default-view (activate-view (make-view (lambda () #f))))
 
 
 ;;; Meshes
@@ -164,15 +180,19 @@
 (define (mesh-property-set! mesh prop-name value)
   (((record-accessor mesh-type 'property-set!) mesh) prop-name value))
 
-(define* (show mesh #:optional (view default-view))
+(define* (show mesh #:optional (view current-view))
   (let ((id (mesh-inner-property mesh 'id))
        (table (view-meshes view)))
-    (if (not (hash-ref table id))
-       (hash-set! table id mesh))))
+    (if (not (assoc-ref table id))
+       (view-meshes-set! view (assoc-set! table id mesh))))
+  mesh)
 
-(define* (hide mesh #:optional (view default-view))
-  (let ((table (view-meshes view)))
-    (hash-remove! table (mesh-inner-property mesh 'id))))
+(define* (hide mesh #:optional (view current-view))
+  (let ((id (mesh-inner-property mesh 'id))
+       (table (view-meshes view)))
+    (if (assoc-ref table id)
+       (view-meshes-set! view (assoc-remove! table id))))
+  mesh)
 
 (define* (translate mesh x y #:optional (z 0))
   (((record-accessor mesh-type 'translate) mesh) x y z)
@@ -216,11 +236,11 @@
   (square video:draw-square))
 
 
+;;; Adding extensions to the main loop
+(add-extension! run-views 10)
+
+
 (module-map (lambda (sym var)
              (if (not (eq? sym '%module-public-interface))
                  (module-export! (current-module) (list sym))))
            (current-module))
-
-
-;;; Adding extensions to the main loop
-(add-extension! run-views 10)