Update of /project/cello/cvsroot/cello/cellodemo In directory clnet:/tmp/cvs-serv15578/cellodemo
Modified Files: demo-window.lisp light-panel.lisp tutor-geometry.lisp Log Message: Ongoing merge with Celtk
--- /project/cello/cvsroot/cello/cellodemo/demo-window.lisp 2006/06/11 13:32:24 1.4 +++ /project/cello/cvsroot/cello/cellodemo/demo-window.lisp 2006/06/26 17:05:20 1.5 @@ -173,7 +173,7 @@ :lb (c? (downs (l-height .parent))) :kids (c? (the-kids (demo-window-beef) - (mk-part :cursor (image) + (mk-part :cursor (ix-view) :px (c? (bif (mpos (mouse-pos .w.)) (v2-h mpos) 100)) :py (c? (bif (mpos (mouse-pos .w.)) @@ -363,23 +363,23 @@
(defun starter-flag () (a-row (:lighting :off) - (mk-part :one (image) + (mk-part :one (ix-view) :ll (u8ths -2) :lt 0 :lr (u8ths 2) :lb (downs (u8ths 2)) :lighting nil :pre-layer (with-layers +red+ (:x-mark t))) (mk-part :canvasflag (ix-canvas-kid-sized) :target-res 96 :kids (the-kids - (mk-part :two (image) + (mk-part :two (ix-view) :px 0 :py 0 :ll (u8ths -2) :lt 0 :lr (u8ths 2) :lb (downs (u8ths 2)) - :bkg-color (c? (trc nil "s mi" self (mouse-image .w.) + :bkg-color (c? (trc nil "s mi" self (mouse-view .w.) (^mouse-over-p)) (if (^mouse-over-p) +black+ +blue+)) :pre-layer (with-layers (:rgba (^bkg-color)) :fill))) :pre-layer (with-layers +black+)) - (mk-part :tree (image) + (mk-part :tree (ix-view) :ll (u8ths -2) :lt 0 :lr (u8ths 2) :lb (downs (u8ths 2)) :pre-layer (with-layers +green+ :fill)) )) --- /project/cello/cvsroot/cello/cellodemo/light-panel.lisp 2006/06/11 13:32:24 1.4 +++ /project/cello/cvsroot/cello/cellodemo/light-panel.lisp 2006/06/26 17:05:20 1.5 @@ -27,7 +27,7 @@ (when old-value (fgn-free (rgba-fo old-value))))
-(defmodel hedron (ix-styled image) +(defmodel hedron (ix-styled ix-view) ((quadric :initform (c? (glu-new-quadric)) :reader quadric) (nurb :reader nurb :initform (c? (let ((nurb (glu-new-nurbs-renderer))) (assert (not (zerop nurb))) --- /project/cello/cvsroot/cello/cellodemo/tutor-geometry.lisp 2006/06/03 12:05:55 1.2 +++ /project/cello/cvsroot/cello/cellodemo/tutor-geometry.lisp 2006/06/26 17:05:20 1.3 @@ -30,7 +30,7 @@ (make-instance 'ix-zero-tl :md-name 'tu-geo :kids (c? (flet ((tu-box (name &rest deets) - (apply 'make-instance 'image + (apply 'make-instance 'ix-view :md-name name :lr (c? (^lr-width 125)) :lb (c? (^lb-height (downs 125)))