Update of /project/cells/cvsroot/cell-cultures/cellodemo In directory common-lisp.net:/tmp/cvs-serv2293/cellodemo

Modified Files: cellodemo.lisp demo-window.lisp tutor-geometry.lisp Log Message: A couple of simple fixes to get the pixel and texture wands (GraphicksMagic stuff) working again and now Cello is pretty much back in business. Date: Fri Oct 1 06:01:10 2004 Author: ktilton

Index: cell-cultures/cellodemo/cellodemo.lisp diff -u cell-cultures/cellodemo/cellodemo.lisp:1.1 cell-cultures/cellodemo/cellodemo.lisp:1.2 --- cell-cultures/cellodemo/cellodemo.lisp:1.1 Sat Jun 26 20:38:35 2004 +++ cell-cultures/cellodemo/cellodemo.lisp Fri Oct 1 06:01:10 2004 @@ -42,22 +42,19 @@ :kids (c? (the-kids (a-row (:px 96 :py (downs 96)) (mk-part :imk-jpg (ix-image-file) + :pre-layer (c? (with-layers +red+ :fill (:wand (^wander)))) :md-value (c? (demo-image-file "shapers" "grace.jpg"))) (a-stack () - (loop for n below 10 + (loop for face in '(antquabi bookosb + georgiai framd times + gothic impact + lucon micross + palab) collect (mk-part :xxx (ix-text) - :text-font (let ((myn n)) - (c? (font-ftgl-ensure :texture - (or (elt '(antquabi bookosb - georgiai framd times - gothic impact - lucon micross - palab) - myn) - *gui-style-default-face*) - 24))) - :text$ "Hello, world!"))) - ) + :pre-layer (with-layers (:rgba +white+)) + :text-font (let ((myface face)) + (c? (font-ftgl-ensure :texture myface 24))) + :text$ "Hello, world!")))) (mk-part :zee (ix-text) :md-value (c? (if (visible (fm-other :ft-jpg)) (without-c-dependency (frame-ct .w.)) 0)) @@ -65,17 +62,17 @@ :justify-hz :center :py (c? (py-maintain-pt (pb (psib)))) :pre-layer (with-layers (:out 1500) +blue+) - :zoom (c? (if (without-c-dependency (< 200 (- (frame-ct .w.) (^md-value)))) + :zoom (c? (let ((start (^md-value))) + (if (without-c-dependency (< 200 (- (frame-ct .w.) start))) .cache - (progn (trc "zooming") - (make-list 3 :initial-element (min 2.0 (/ (- (frame-ct .w.) (^md-value)) + (make-list 3 :initial-element (min 2.0 (/ (- (frame-ct .w.) start) 100.0))))))

- :rotation (c? (if (without-c-dependency (< 200 (- (frame-ct .w.) (^md-value)))) + :rotation (c? (let ((start (^md-value))) + (if (without-c-dependency (< 200 (- (frame-ct .w.) start))) .cache - (progn - (trc "rotating") - (list (* 360 (/ (min 200 (- (frame-ct .w.) (^md-value))) 100.0)) + (list (* 360 (/ (min 200 (- (frame-ct .w.) start)) 100.0)) 1 1 1)))) + :text-font (c? (font-ftgl-ensure :texture *gui-style-default-face* 24 )) - :text$ "Hello, world!"))))) + :text$ "hello, world!")))))

Index: cell-cultures/cellodemo/demo-window.lisp diff -u cell-cultures/cellodemo/demo-window.lisp:1.2 cell-cultures/cellodemo/demo-window.lisp:1.3 --- cell-cultures/cellodemo/demo-window.lisp:1.2 Wed Sep 29 04:50:11 2004 +++ cell-cultures/cellodemo/demo-window.lisp Fri Oct 1 06:01:10 2004 @@ -30,9 +30,9 @@ :skin (c? (wand-ensure-typed 'wand-texture (car (md-value (fm-other :texture-picker))))) :focus (c-in nil) - :display-continuous (c-in nil) + :display-continuous (c-in t) :clear-rgba (list 0 0 0 1) - :lb (c-in (downs 750))))) + :lb (c-in (downs 650)))))

(defun demo-scroller () (mk-part :demo-scroller (ig-zero-tl) @@ -85,22 +85,12 @@ (make-instance 'gui-style-ftgl :id :button :face *gui-style-button-face* - :sizes '(12 12 12 12 12) - :text-color +white+) - (make-instance 'gui-style-ftgl - :id :label - :face *gui-style-button-face* :sizes '(14 14 14 14 14) :text-color +white+) (make-instance 'gui-style-ftgl - :id :unique - :face *gui-style-button-face* - :sizes '(24 24 24 24 24) - :text-color +white+) - (make-instance 'gui-style-ftgl - :id :unique2 + :id :label :face *gui-style-button-face* - :sizes '(18 18 18 18 18) + :sizes '(12 12 12 12 12) :text-color +white+) (make-instance 'gui-style-ftgl :id :default @@ -145,7 +135,7 @@ :name "bingo" :type "mpg") *user-temp-directory*))))

- ;;;:display-continuous t + :display-continuous nil :md-name :demo-w :title$ "Hello, world" :skin nil @@ -160,7 +150,7 @@ :directory `(:relative "graphics" "out") :name (format nil "snap-me-~3,,,'0@A" (snapshot-release-id self)) - :type "png") + :type "jpg") cl-user::*devel-root*))

:pre-layer (c? (with-layers @@ -245,7 +235,7 @@ (a-stack (:spacing (u16ths 1)) (texture-picker) (demo-picker)) - #+nah (a-stack (:spacing (u96ths 6) + (a-stack (:spacing (u96ths 6) :justify :center :outset (u96ths 6) :visible (c? (not (snapshot-release-id .w.)))

Index: cell-cultures/cellodemo/tutor-geometry.lisp diff -u cell-cultures/cellodemo/tutor-geometry.lisp:1.1 cell-cultures/cellodemo/tutor-geometry.lisp:1.2 --- cell-cultures/cellodemo/tutor-geometry.lisp:1.1 Sat Jun 26 20:38:35 2004 +++ cell-cultures/cellodemo/tutor-geometry.lisp Fri Oct 1 06:01:10 2004 @@ -36,11 +36,9 @@ :pre-layer (c? (with-layers (:disable gl_texture_2d) :off - (:line-width 3) + (:line-width 2) (:rgba (^skin)) - :line-frame - (:poly-mode gl_front_and_back gl_fill) - (:rect -2 -2 2 2))) + :line-frame)) deets))) (the-kids (tu-box :ftgrow