Update of /project/cells/cvsroot/cell-cultures/cello In directory common-lisp.net:/tmp/cvs-serv7571/cello
Modified Files: cello.lisp image.lisp Log Message: Cleaning up Date: Sun Dec 5 05:50:00 2004 Author: ktilton
Index: cell-cultures/cello/cello.lisp diff -u cell-cultures/cello/cello.lisp:1.3 cell-cultures/cello/cello.lisp:1.4 --- cell-cultures/cello/cello.lisp:1.3 Thu Oct 28 02:08:56 2004 +++ cell-cultures/cello/cello.lisp Sun Dec 5 05:49:59 2004 @@ -33,3 +33,4 @@ #:cl-ftgl #:cl-magick))
+(in-package :cello)
Index: cell-cultures/cello/image.lisp diff -u cell-cultures/cello/image.lisp:1.7 cell-cultures/cello/image.lisp:1.8 --- cell-cultures/cello/image.lisp:1.7 Wed Nov 17 13:31:24 2004 +++ cell-cultures/cello/image.lisp Sun Dec 5 05:49:59 2004 @@ -60,24 +60,24 @@ (defmodel ogl-node () ((dsp-list :initarg :dsp-list :accessor dsp-list :initform (c-formula (:lazy :until-asked) - (assert *w*) - (assert (not *ogl-listing-p*)) - (time (progn (ogl-dsp-list-prep self) - (when (every 'dsp-list (kids self)) - (let ((display-list-name (or .cache (gl-gen-lists 1))) - (*ogl-shared-resource-tender* - (ogl-shared-resource-tender self))) - - (gl-new-list display-list-name gl_compile) - (trc nil "starting display list" display-list-name self) - (let ((*ogl-listing-p* self) - *selecting* *render-clip-l* *render-clip-r* *render-clip-t* *render-clip-b*) - (with-metrics (nil nil "(funcall renderer)" self) - (ix-paint self))) - (trc nil "finished display list" display-list-name self) - (gl-end-list) - (setf (redisplayp (ogl-node-window self)) t) - display-list-name)))))) + (assert *w*) + (assert (not *ogl-listing-p*)) + (progn + (ogl-dsp-list-prep self) + (when (every 'dsp-list (kids self)) + (let ((display-list-name (or .cache (gl-gen-lists 1))) + (*ogl-shared-resource-tender* + (ogl-shared-resource-tender self))) + (gl-new-list display-list-name gl_compile) + (trc nil "starting display list" display-list-name self) + (let ((*ogl-listing-p* self) + *selecting* *render-clip-l* *render-clip-r* *render-clip-t* *render-clip-b*) + (with-metrics (nil nil "(funcall renderer)" self) + (ix-paint self))) + (trc nil "finished display list" display-list-name self) + (gl-end-list) + (setf (redisplayp (ogl-node-window self)) t) + display-list-name))))) (gl-name :initarg :gl-name :initform nil :accessor gl-name) (renderer :initarg :renderer :initform nil :accessor renderer)))