Update of /project/cello/cvsroot/cello In directory clnet:/tmp/cvs-serv29491 Modified Files: nehe-06.lisp window-utilities.lisp Log Message: important fixes to cl-magick and cello demo nehe-06 --- /project/cello/cvsroot/cello/nehe-06.lisp 2006/07/24 05:00:35 1.8 +++ /project/cello/cvsroot/cello/nehe-06.lisp 2006/08/31 17:34:47 1.9 @@ -23,7 +23,11 @@ (defparameter zrot 0.0f0) (defparameter *skin6* nil) +(defvar *jmc-font* ) + (defun nehe-06 () ;; ACL project manager needs a zero-argument function, in project package + (setf *jmc-font* (ftgl-make :texture 'sylfaen 48 96 18)) + (cl-magick-reset) (test-window 'nehe-06-demo)) (defmodel nehe-06-demo (window) @@ -79,7 +83,7 @@ (gl-load-identity)))) -(defparameter *jmc-font* (ftgl-make :texture 'sylfaen 48 96 18)) + (defmethod togl-display-using-class ((self nehe06)) (gl-load-identity) --- /project/cello/cvsroot/cello/window-utilities.lisp 2006/08/21 04:28:26 1.7 +++ /project/cello/cvsroot/cello/window-utilities.lisp 2006/08/31 17:34:47 1.8 @@ -98,6 +98,8 @@ (let ((,item-var (elt ,list (- ,len ,times-var 1)))) ,@body))))) +(export! find-ix-under) + (defun find-ix-under (self os-pos &key (test #'true)) (when (and (visible self) (not (collapsed self)))