X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fviews.scm;h=887c65cb9cbdeeecbee760f5e895493fa0b6629e;hb=f02971f747ab2e643e2bc6bd962a068329b0f402;hp=46657293c54d94bd5ee0509b43dd1a06fd9aeb4d;hpb=779dc6f65b65f45439355545fb1063b40dcc44ea;p=gacela.git

diff --git a/src/views.scm b/src/views.scm
index 4665729..887c65c 100644
--- a/src/views.scm
+++ b/src/views.scm
@@ -26,23 +26,46 @@
 
 (define view-type
   (make-record-type "view" 
-		    '(id constructor body meshes priority)
+		    '(id controllers meshes priority)
 		    (lambda (record port)
 		      (format port "#<view: ~a meshes>"
 			      (length (view-meshes record))))))
 
-(define (make-view constructor) ((record-constructor view-type) (gensym) constructor #f '() 0))
+(define (make-view controllers meshes priority) ((record-constructor view-type) (gensym) controllers meshes priority))
 (define view? (record-predicate view-type))
 (define view-id (record-accessor view-type 'id))
-(define view-constructor (record-accessor view-type 'constructor))
-(define view-body (record-accessor view-type 'body))
 (define view-meshes (record-accessor view-type 'meshes))
+(define view-meshes-set! (record-modifier view-type 'meshes))
+(define view-controllers (record-accessor view-type 'controllers))
+(define view-controllers-set! (record-modifier view-type 'controllers))
 (define view-priority (record-accessor view-type 'priority))
 
-(define-macro (define-view body)
-  `(make-view (lambda () ,body)))
+(defmacro* view (#:key (priority 0) . elements)
+  `(let ((e (view-elements ,@elements)))
+     (make-view (car e) (cadr e) ,priority)))
+
+(define-macro (view-elements . elements)
+  (cond ((null? elements) `'(() ()))
+	(else
+	 `(let ((l (view-elements ,@(cdr elements))))
+	    ,(let ((e (car elements)))
+	       `(cond ((mesh? ,e)
+		       (list (car l) (cons ,e (cadr l))))
+		      ((procedure? ,e)
+		       (list (cons ,(if (list? e) e `(lambda () (,e))) (car l))
+			     (cadr l)))
+		      (else l)))))))
+
+(define (controllers-list list controllers)
+  (cond ((null? controllers)
+	 list)
+	((list? (car controllers))
+	 (assoc-set! (controllers-list list (cdr controllers)) (caar controllers) (cadar controllers)))
+	(else
+	 (assoc-set! (controllers-list list (cdr controllers)) (gensym) (car controllers)))))
 
 (define activated-views '())
+
 (define (sort-views views-alist)
   (sort views-alist
 	(lambda (v1 v2)
@@ -58,14 +81,15 @@
 
 (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))
 	 (set! current-view (cdar views))
-	 ; controllers go here
+	 ;((view-body current-view))
 	 (draw-meshes (view-meshes current-view))
 	 (run-views (cdr views)))))
 
@@ -77,7 +101,7 @@
 	 (draw-meshes (cdr meshes)))))
 
 
-(define default-view (activate-view (define-view '())))
+;(define default-view (activate-view (make-view (lambda () #f))))
 
 
 ;;; Meshes
@@ -173,12 +197,16 @@
 (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 current-view))
-  (let ((table (view-meshes view)))
-    (hash-remove! table (mesh-inner-property mesh 'id))))
+  (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)