July 2006 - cello-cvs@common-lisp.net - mailman3.common-lisp.net

[cello-cvs] CVS cello
by ktilton 24 Jul '06

24 Jul '06

Update of /project/cello/cvsroot/cello In directory clnet:/tmp/cvs-serv25558 Modified Files: cello.lpr colors.lisp ix-layer-expand.lisp nehe-06.lisp Log Message: --- /project/cello/cvsroot/cello/cello.lpr 2006/07/06 22:09:10 1.9 +++ /project/cello/cvsroot/cello/cello.lpr 2006/07/24 05:00:35 1.10 @@ -1,4 +1,4 @@ -;; -*- lisp-version: "8.0 [Windows] (Jul 5, 2006 12:21)"; cg: "1.81"; -*- +;; -*- lisp-version: "8.0 [Windows] (Jul 11, 2006 4:27)"; cg: "1.81"; -*- (in-package :cg-user) --- /project/cello/cvsroot/cello/colors.lisp 2006/07/06 22:09:10 1.4 +++ /project/cello/cvsroot/cello/colors.lisp 2006/07/24 05:00:35 1.5 @@ -71,7 +71,7 @@ (cffi:mem-aref co :float 3))) (eval-when (:compile-toplevel :load-toplevel :execute) - (export '(+white+ +red+ +dark-green+ +green+ +turqoise+ +dk-blue+ + (export '(+white+ +red+ +dark-green+ +green+ +turquoise+ +dk-blue+ +blue+ +lt-blue+ +black+ +yellow+ +lt-yellow+ +purple+ +gray+ +lt-gray+ +dk-gray+))) @@ -79,7 +79,7 @@ (defparameter +red+ (mk-rgba 255 0 0 255)) (defparameter +dark-green+ (mk-rgba 0 128 0 255)) (defparameter +green+ (mk-rgba 0 255 0 255)) -(defparameter +turqoise+ (mk-rgba 0 255 255 255)) +(defparameter +turquoise+ (mk-rgba 0 255 255 255)) (defparameter +dk-blue+ (mk-rgba 0 0 64 50)) (defparameter +blue+ (mk-rgba 0 0 255 255)) (defparameter +lt-blue+ (mk-rgba 127 127 255 255)) --- /project/cello/cvsroot/cello/ix-layer-expand.lisp 2006/07/06 22:09:10 1.6 +++ /project/cello/cvsroot/cello/ix-layer-expand.lisp 2006/07/24 05:00:35 1.7 @@ -34,7 +34,7 @@ (def-layer-expansion +red+) (def-layer-expansion +dark-green+) (def-layer-expansion +green+) -(def-layer-expansion +turqoise+) +(def-layer-expansion +turquoise+) (def-layer-expansion +dk-blue+) (def-layer-expansion +blue+) (def-layer-expansion +lt-blue+) --- /project/cello/cvsroot/cello/nehe-06.lisp 2006/07/06 22:09:10 1.7 +++ /project/cello/cvsroot/cello/nehe-06.lisp 2006/07/24 05:00:35 1.8 @@ -143,7 +143,7 @@ (gl-tex-coord2f 0 1) (v3f -1 1 -1) )) ;;#+ifuwanttoseepixmap - (wand-render *grace* 0 0 1 -1) + ;;(wand-render *grace* 0 0 1 -1) (progn (gl-scalef 0.006 0.006 0.0)

1 0

[cello-cvs] CVS cello/cl-ftgl
by ktilton 08 Jul '06

08 Jul '06

Update of /project/cello/cvsroot/cello/cl-ftgl In directory clnet:/tmp/cvs-serv5453/cl-ftgl Modified Files: cl-ftgl.lisp Log Message: Initialize array element to nil, critical to algorithm --- /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp 2006/07/06 22:09:11 1.6 +++ /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp 2006/07/08 03:29:09 1.7 @@ -20,7 +20,7 @@ ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ;;; IN THE SOFTWARE. -;;; $Header: /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp,v 1.6 2006/07/06 22:09:11 ktilton Exp $ +;;; $Header: /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp,v 1.7 2006/07/08 03:29:09 ktilton Exp $ (defpackage #:cl-ftgl (:nicknames #:ftgl) @@ -173,7 +173,7 @@ (defstruct ftgl face size target-res depth descender ascender - (widths (make-array 256)) + (widths (make-array 256 :initial-element nil)) ft-metrics ifont)

1 0

[cello-cvs] CVS cello/cl-magick
by ktilton 07 Jul '06

07 Jul '06

Update of /project/cello/cvsroot/cello/cl-magick In directory clnet:/tmp/cvs-serv22894/cl-magick Modified Files: wand-image.lisp Log Message: --- /project/cello/cvsroot/cello/cl-magick/wand-image.lisp 2006/07/06 22:09:11 1.2 +++ /project/cello/cvsroot/cello/cl-magick/wand-image.lisp 2006/07/07 14:09:15 1.3 @@ -98,7 +98,6 @@ (let* ((columns (- last-col first-col)) (rows (- last-row first-row)) (pixels (fgn-alloc :unsigned-char (* 3 columns rows) :wand-image))) - (ukt:trc "wand pixels has colrowa" columns rows) ;(print (list "wand-get-image-pixels got" wand (* 3 columns rows) pixels)) (magick-get-image-pixels wand first-col first-row columns rows "RGB" 0 pixels ) @@ -108,7 +107,7 @@ (print `(writeimage ,(magick-write-image wand (format nil "C:\\TEST~a.GIF" testn)))) #+not (print `(writeimage ,(magick-write-image wand "C:\\TEST.BMP")))) - (loop for row below 16 do + #+jesfoolinaround(loop for row below 16 do (loop for col below 16 by 1 for offset = (+ (* row columns 3) (* col 3)) do (print (loop for bn below 3

1 0

[cello-cvs] CVS cello/cl-ftgl
by ktilton 07 Jul '06

07 Jul '06

Update of /project/cello/cvsroot/cello/cl-ftgl In directory clnet:/tmp/cvs-serv3104/cl-ftgl Added Files: cl-ftgl.asd Log Message: --- /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.asd 2006/07/07 01:14:21 NONE +++ /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.asd 2006/07/07 01:14:21 1.1 (asdf:defsystem :cl-ftgl :depends-on (:cffi :kt-opengl :cells) :serial t :components ((:file "cl-ftgl")))

1 0

[cello-cvs] CVS cello/kt-opengl
by ktilton 06 Jul '06

06 Jul '06

Update of /project/cello/cvsroot/cello/kt-opengl In directory clnet:/tmp/cvs-serv9972/kt-opengl Modified Files: kt-opengl.asd ogl-macros.lisp ogl-utils.lisp Log Message: --- /project/cello/cvsroot/cello/kt-opengl/kt-opengl.asd 2006/05/27 06:01:38 1.1 +++ /project/cello/cvsroot/cello/kt-opengl/kt-opengl.asd 2006/07/06 22:09:11 1.2 @@ -13,7 +13,7 @@ :licence "MIT" :description "Partial OpenGL Bindings" :long-description "Poorly implemented bindings to half of OpenGL" - :depends-on (:cffi-extender) + :depends-on (:cffi-extender :cells) :serial t :components ((:file "kt-opengl") (:file "gl-def") --- /project/cello/cvsroot/cello/kt-opengl/ogl-macros.lisp 2006/07/03 00:35:16 1.4 +++ /project/cello/cvsroot/cello/kt-opengl/ogl-macros.lisp 2006/07/06 22:09:11 1.5 @@ -24,7 +24,7 @@ (in-package :kt-opengl) -(eval-when (compile load eval) +(eval-when (:compile-toplevel :load-toplevel :execute) (export '(with-gl-translation))) (defvar *stack-depth* @@ -44,19 +44,6 @@ (funcall matrix-fn)) (gl-pop-matrix))) -(defun get-stack-depth (mm) - (gl-get-integerv - (ecase (matrix-mode-symbol mm) - (gl_modelview gl_modelview_stack_depth) - (gl_projection gl_projection_stack_depth) - (gl_texture gl_texture_stack_depth)) - *stack-depth*) - (aforef *stack-depth* 0)) - -(defun get-matrix-mode () - (gl-get-integerv gl_matrix_mode *ogl-int*) - (eltgli *ogl-int* 0)) - #+debugversion (defun call-with-matrix (load-identity-p matrix-fn matrix-code) (let* ((mm-pushed (get-matrix-mode)) --- /project/cello/cvsroot/cello/kt-opengl/ogl-utils.lisp 2006/06/05 01:47:50 1.2 +++ /project/cello/cvsroot/cello/kt-opengl/ogl-utils.lisp 2006/07/06 22:09:12 1.3 @@ -177,6 +177,19 @@ (defun ogl-raster-pos-get () (gl-get-ints-4 gl_current_raster_position)) +(defun get-stack-depth (mm) + (gl-get-integerv + (ecase (matrix-mode-symbol mm) + (gl_modelview gl_modelview_stack_depth) + (gl_projection gl_projection_stack_depth) + (gl_texture gl_texture_stack_depth)) + *stack-depth*) + (aforef *stack-depth* 0)) + +(defun get-matrix-mode () + (gl-get-integerv gl_matrix_mode *ogl-int*) + (eltgli *ogl-int* 0)) + (defmacro with-bitmap-shifted ((x y) &body body) (let ((xy (gensym))) `(let ((,xy (cons ,x ,y)))

1 0

[cello-cvs] CVS cello/cl-ftgl
by ktilton 06 Jul '06

06 Jul '06

Update of /project/cello/cvsroot/cello/cl-ftgl In directory clnet:/tmp/cvs-serv9972/cl-ftgl Modified Files: cl-ftgl.lisp Log Message: --- /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp 2006/07/03 00:35:12 1.5 +++ /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp 2006/07/06 22:09:11 1.6 @@ -20,7 +20,7 @@ ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ;;; IN THE SOFTWARE. -;;; $Header: /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp,v 1.5 2006/07/03 00:35:12 ktilton Exp $ +;;; $Header: /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp,v 1.6 2006/07/06 22:09:11 ktilton Exp $ (defpackage #:cl-ftgl (:nicknames #:ftgl) @@ -51,7 +51,7 @@ (in-package :cl-ftgl) (define-foreign-library FTGL - (:darwin (:framework "FTGL")) + (:darwin (:or (:framework "FTGL") "libftgl.dylib")) (:windows (:or "/0dev/user/dynlib/ftgl_dynamic_MTD_d.dll"))) (use-foreign-library FTGL) @@ -177,8 +177,12 @@ ft-metrics ifont) +(defun ftgl-assert-opengl-context () + ;; use when debugging FTGL being hit before opengl context estanblished (assert *ftgl-ogl*) + ) + (defun ftgl-char-width (f c) - (assert *ftgl-ogl*) + (ftgl-assert-opengl-context) (or (aref (ftgl-widths f) (char-code c)) (setf (aref (ftgl-widths f) (char-code c)) (ftgl-string-length f (string c))))) @@ -220,19 +224,19 @@ (xftgl) (defun ftgl-get-ascender (font) - (assert *ftgl-ogl*) + (ftgl-assert-opengl-context) (or (ftgl-ascender font) (setf (ftgl-ascender font) (fgc-ascender (ftgl-get-metrics-font font))))) (defun ftgl-get-descender (font) - (assert *ftgl-ogl*) + (ftgl-assert-opengl-context) (or (ftgl-descender font) (setf (ftgl-descender font) (fgc-descender (ftgl-get-metrics-font font))))) (defun ftgl-height (f) - (assert *ftgl-ogl*) + (ftgl-assert-opengl-context) (- (ftgl-get-ascender f) (ftgl-get-descender f)))

1 0

[cello-cvs] CVS cello/cl-magick
by ktilton 06 Jul '06

06 Jul '06

Update of /project/cello/cvsroot/cello/cl-magick In directory clnet:/tmp/cvs-serv9972/cl-magick Modified Files: cl-magick.asd cl-magick.lisp cl-magick.lpr mgk-utils.lisp wand-image.lisp Log Message: --- /project/cello/cvsroot/cello/cl-magick/cl-magick.asd 2006/05/17 16:14:29 1.1 +++ /project/cello/cvsroot/cello/cl-magick/cl-magick.asd 2006/07/06 22:09:11 1.2 @@ -16,6 +16,7 @@ :licence "MIT" :description "Bindings for ImageMagick" :long-description "Poorly implemented bindings to half of ImageMagick" + :depends-on (gui-geometry) :components ((:file "cl-magick") (:file "magick-wand" :depends-on ("cl-magick")) (:file "drawing-wand" :depends-on ("magick-wand")) @@ -23,5 +24,4 @@ (:file "mgk-utils" :depends-on ("pixel-wand")) (:file "wand-image" :depends-on ("mgk-utils")) (:file "wand-texture" :depends-on ("wand-image")) - (:file "wand-pixels" :depends-on ("wand-texture")) - (:file "mgk-test" :depends-on ("wand-pixels")))) + (:file "wand-pixels" :depends-on ("wand-texture")))) --- /project/cello/cvsroot/cello/cl-magick/cl-magick.lisp 2006/06/26 17:05:22 1.4 +++ /project/cello/cvsroot/cello/cl-magick/cl-magick.lisp 2006/07/06 22:09:11 1.5 @@ -25,7 +25,7 @@ (:use #:common-lisp #:gui-geometry - #-(or cormanlisp ccl) #:clos + #-(or cormanlisp ccl sbcl) #:clos #:cffi #:cffi-extender #+kt-opengl @@ -58,7 +58,7 @@ (defparameter *mgk-version* (fgn-alloc :unsigned-long 1)) (cffi:define-foreign-library Magick - (:darwin (:framework "GraphicsMagick")) + (:darwin (:or (:framework "GraphicsMagick") "libGraphicsMagick.dylib")) (:windows (:or #+not "C:\\Program Files\\ImageMagick-6.2.7-Q8\\CORE_RL_wand_.dll" "C:\\Program Files\\GraphicsMagick-1.1.7-Q8\\CORE_RL_wand_.dll"))) @@ -103,7 +103,7 @@ (let ((wi (apply 'make-instance wand-type :file-path$ file-path$ iargs))) - (print `(wand-ensure-typed forced to load ,wand-type ,file-path$)) + ;;(print `(wand-ensure-typed forced to load ,wand-type ,file-path$)) (push (cons key wi) (wands-loaded)) wi) (error "Unable to load image file ~a" file-path$))))) --- /project/cello/cvsroot/cello/cl-magick/cl-magick.lpr 2006/07/03 00:35:13 1.4 +++ /project/cello/cvsroot/cello/cl-magick/cl-magick.lpr 2006/07/06 22:09:11 1.5 @@ -1,4 +1,4 @@ -;; -*- lisp-version: "8.0 [Windows] (Jun 28, 2006 10:53)"; cg: "1.81"; -*- +;; -*- lisp-version: "8.0 [Windows] (Jul 5, 2006 12:21)"; cg: "1.81"; -*- (in-package :cg-user) --- /project/cello/cvsroot/cello/cl-magick/mgk-utils.lisp 2006/05/17 16:14:29 1.1 +++ /project/cello/cvsroot/cello/cl-magick/mgk-utils.lisp 2006/07/06 22:09:11 1.2 @@ -22,7 +22,7 @@ (in-package :cl-magick) -(eval-when (compile load eval) +(eval-when (:compile-toplevel :load-toplevel :execute) (export '(pixels-to-file wand-image-pixels-set make-recording record-frame recording-write recording-destroy))) --- /project/cello/cvsroot/cello/cl-magick/wand-image.lisp 2006/05/17 16:14:29 1.1 +++ /project/cello/cvsroot/cello/cl-magick/wand-image.lisp 2006/07/06 22:09:11 1.2 @@ -69,7 +69,7 @@ (let ((stat (magick-read-image wand p))) (if (zerop stat) (format t "~&magick-read jpeg failed on ~a" p) - (format t "~&magick-read-OK ~a" p))) + #+shhh (format t "~&magick-read-OK ~a" p))) wand)) (defparameter *mgk-columns* @@ -90,7 +90,7 @@ (if (zerop (* last-col last-row)) (let* ((columns 64)(rows 64) (pixels (fgn-alloc :unsigned-char (* 3 columns rows) :wand-image))) - (print "wand-get-image-pixels > wand has zero pixels; did the load fail?") + ;(print "wand-get-image-pixels > wand has zero pixels; did the load fail?") (dotimes (pn (* columns rows)) (setf (elti pixels pn) -1)) (values pixels columns rows)) @@ -98,7 +98,9 @@ (let* ((columns (- last-col first-col)) (rows (- last-row first-row)) (pixels (fgn-alloc :unsigned-char (* 3 columns rows) :wand-image))) - (print (list "wand-get-image-pixels got" wand (* 3 columns rows) pixels)) + (ukt:trc "wand pixels has colrowa" columns rows) + + ;(print (list "wand-get-image-pixels got" wand (* 3 columns rows) pixels)) (magick-get-image-pixels wand first-col first-row columns rows "RGB" 0 pixels ) #+testing (progn (incf testn) @@ -106,5 +108,11 @@ (print `(writeimage ,(magick-write-image wand (format nil "C:\\TEST~a.GIF" testn)))) #+not (print `(writeimage ,(magick-write-image wand "C:\\TEST.BMP")))) + (loop for row below 16 do + (loop for col below 16 by 1 + for offset = (+ (* row columns 3) (* col 3)) + do (print (loop for bn below 3 + collecting (setf (elti pixels (+ offset bn)) 0))))) + (values pixels columns rows))))

1 0

[cello-cvs] CVS cello/cl-openal
by ktilton 06 Jul '06

06 Jul '06

Update of /project/cello/cvsroot/cello/cl-openal In directory clnet:/tmp/cvs-serv9972/cl-openal Modified Files: cl-openal.asd Log Message: --- /project/cello/cvsroot/cello/cl-openal/cl-openal.asd 2006/05/17 16:14:29 1.1 +++ /project/cello/cvsroot/cello/cl-openal/cl-openal.asd 2006/07/06 22:09:11 1.2 @@ -16,6 +16,7 @@ :licence "MIT" :description "Partial OpenAL Bindings" :long-description "Poorly implemented bindings to half of OpenAL" + :depends-on (cffi cffi-extender) :perform (load-op :after (op cl-openal) (pushnew :cl-openal cl:*features*)) :components ((:file "cl-openal") @@ -28,4 +29,4 @@ (:file "cl-openal-init" :depends-on ("alut")) (:file "wav-handling" :depends-on ("cl-openal-init")) - (:file "cl-openal-demo" :depends-on ("wav-handling")))) \ No newline at end of file + (:file "cl-openal-demo" :depends-on ("wav-handling"))))

1 0

[cello-cvs] CVS cello
by ktilton 06 Jul '06

06 Jul '06

Update of /project/cello/cvsroot/cello In directory clnet:/tmp/cvs-serv9972 Modified Files: cello-magick.lisp cello-openal.lisp cello.asd cello.lisp cello.lpr colors.lisp ctl-markbox.lisp focus.lisp image.lisp ix-canvas.lisp ix-family.lisp ix-layer-expand.lisp ix-opengl.lisp ix-text.lisp ix-togl.lisp nehe-06.lisp Log Message: --- /project/cello/cvsroot/cello/cello-magick.lisp 2006/06/26 17:05:20 1.4 +++ /project/cello/cvsroot/cello/cello-magick.lisp 2006/07/06 22:09:10 1.5 @@ -16,8 +16,6 @@ (in-package :cello) -(defpackage :cello (:use #:cl-magick)) - (eval-when (compile load eval) (defmethod ix-layer-expand ((key (eql :wand)) &rest args) `(let ((wand ,(car args))) --- /project/cello/cvsroot/cello/cello-openal.lisp 2006/06/26 17:05:20 1.3 +++ /project/cello/cvsroot/cello/cello-openal.lisp 2006/07/06 22:09:10 1.4 @@ -14,8 +14,6 @@ |# -(defpackage #:cello (:use #:cl-openal)) - (in-package :cello) (defstruct sound paths (gain 1) callback loopingp start (source :default) buffer sources) --- /project/cello/cvsroot/cello/cello.asd 2006/06/05 01:47:49 1.3 +++ /project/cello/cvsroot/cello/cello.asd 2006/07/06 22:09:10 1.4 @@ -17,48 +17,47 @@ :description "A Portable Common Lisp GUI" :long-description "The final pieces of a portable Common Lisp GUI" - :depends-on (:cells :gui-geometry :cl-opengl :cl-magick) - :components ((:file "cello") - (:file "window-macros" :depends-on ("cello")) - (:file "clipping" :depends-on ("cello")) - (:file "colors" :depends-on ("clipping")) - (:file "frame" :depends-on ("colors")) - (:file "application" :depends-on ("frame")) - (:file "image" - :depends-on ("application" - "window-macros" "clipping")) - (:file "ix-layer-expand" :depends-on ("cello" "image" "frame")) - (:file "ix-opengl" :depends-on ("image")) - (:file "ix-canvas" :depends-on ("ix-layer-expand")) - (:file "ix-family" :depends-on ("cello" "ix-canvas")) - (:file "font" :depends-on ("image")) - (:file "ix-grid" :depends-on ("ix-inline")) - (:file "mouse-click" :depends-on ("ix-grid")) - (:file "control" :depends-on ("mouse-click")) - (:file "focus" :depends-on ("ix-canvas")) - (:file "focus-navigation" :depends-on ("focus")) - (:file "focus-utilities" :depends-on ("focus-navigation")) - (:file "ix-styled" :depends-on ("ix-canvas" "font")) - (:file "ix-text" :depends-on ("ix-styled")) - (:file "ix-togl" :depends-on ("ix-text")) - (:file "lighting" :depends-on ("ix-inline")) - (:file "cello-window" :depends-on ("image" "lighting")) - (:file "ctl-toggle" :depends-on ("control" "ix-text")) - (:file "ctl-markbox" :depends-on ("ctl-toggle")) - (:file "ctl-drag" :depends-on ("ctl-markbox")) - (:file "ctl-selectable" :depends-on ("ctl-drag")) - (:file "slider" :depends-on ("ctl-selectable")) - (:file "window-utilities" :depends-on ("cello-window")) - (:file "window-callbacks" :depends-on ("window-utilities")) - (:file "wm-mouse" :depends-on ("window-callbacks")) - (:file "pick" :depends-on ("wm-mouse")) - (:file "ix-render" :depends-on ("pick")) - (:file "ix-polygon" :depends-on ("ix-render")) - (:file "cello-ftgl") - (:file "cello-openal") - (:file "cello-magick" :depends-on ("cello-ftgl")) - (:file "nehe-06" :depends-on ("cello-magick")) - )) + :depends-on (:cells :gui-geometry :kt-opengl :cffi-extender :cl-magick + :celtk :cl-openal) + :serial t + :components + ((:file "cello") + (:file "window-macros") + (:file "clipping") + (:file "colors") + (:file "ix-layer-expand") + (:file "frame") + (:file "application") + (:file "image") + (:file "ix-opengl") + (:file "ix-canvas") + (:file "ix-family") + (:file "font") + (:file "ix-grid") + (:file "mouse-click") + (:file "control") + (:file "focus") + (:file "focus-navigation") + (:file "focus-utilities") + (:file "ix-styled") + (:file "ix-text") + (:file "ix-togl") + (:file "lighting") + (:file "ctl-toggle") + (:file "ctl-markbox") + (:file "ctl-drag") + (:file "ctl-selectable") + (:file "slider") + (:file "cello-window") + (:file "window-utilities") + (:file "wm-mouse") + (:file "pick") + (:file "ix-paint") + (:file "ix-polygon") + (:file "cello-ftgl") + (:file "cello-magick") + (:file "cello-openal") + (:file "nehe-06"))) --- /project/cello/cvsroot/cello/cello.lisp 2006/06/26 17:05:20 1.6 +++ /project/cello/cvsroot/cello/cello.lisp 2006/07/06 22:09:10 1.7 @@ -18,7 +18,7 @@ (:nicknames :clo) (:use #:common-lisp - #-(or ccl cormanlisp) #:clos + #-(or ccl cormanlisp sbcl) #:clos #:utils-kt #:cells #:gui-geometry @@ -41,4 +41,4 @@ () (:default-initargs :ll 0 :lt 0 :lr (u96ths 48) - :lb (u96ths 24))) \ No newline at end of file + :lb (u96ths 24))) --- /project/cello/cvsroot/cello/cello.lpr 2006/07/03 00:35:12 1.8 +++ /project/cello/cvsroot/cello/cello.lpr 2006/07/06 22:09:10 1.9 @@ -1,4 +1,4 @@ -;; -*- lisp-version: "8.0 [Windows] (Jun 28, 2006 10:53)"; cg: "1.81"; -*- +;; -*- lisp-version: "8.0 [Windows] (Jul 5, 2006 12:21)"; cg: "1.81"; -*- (in-package :cg-user) --- /project/cello/cvsroot/cello/colors.lisp 2006/06/05 01:47:49 1.3 +++ /project/cello/cvsroot/cello/colors.lisp 2006/07/06 22:09:10 1.4 @@ -70,7 +70,7 @@ (cffi:mem-aref co :float 2) (cffi:mem-aref co :float 3))) -(eval-when (compile load execute) +(eval-when (:compile-toplevel :load-toplevel :execute) (export '(+white+ +red+ +dark-green+ +green+ +turqoise+ +dk-blue+ +blue+ +lt-blue+ +black+ +yellow+ +lt-yellow+ +purple+ +gray+ +lt-gray+ +dk-gray+))) --- /project/cello/cvsroot/cello/ctl-markbox.lisp 2006/06/26 17:05:20 1.5 +++ /project/cello/cvsroot/cello/ctl-markbox.lisp 2006/07/06 22:09:10 1.6 @@ -18,7 +18,7 @@ (defparameter *mark-box-size* (u96ths 9)) -(eval-when (compile load eval) +(eval-now! (defmethod ix-layer-expand ((self (eql :x-mark)) &rest args) `(ix-render-x-mark ,(car args) l-box))) --- /project/cello/cvsroot/cello/focus.lisp 2006/06/26 17:05:20 1.3 +++ /project/cello/cvsroot/cello/focus.lisp 2006/07/06 22:09:10 1.4 @@ -34,7 +34,7 @@ it without it being a kid there |# -(eval-when (compile load eval) +(eval-now! (export '(^focus focus))) (defmodel focuser (ix-canvas) --- /project/cello/cvsroot/cello/image.lisp 2006/07/03 00:35:12 1.8 +++ /project/cello/cvsroot/cello/image.lisp 2006/07/06 22:09:10 1.9 @@ -147,6 +147,10 @@ (defmethod path ((self ix-view)) (path (fm-parent self))) +(defgeneric ogl-dsp-list-prep (self) + (:method-combination progn) + (:documentation "Do stuff needed before render but not needed/wanted in display list")) + (defmethod ogl-dsp-list-prep progn ((self ix-view)) (ogl-dsp-list-prep (skin self))) --- /project/cello/cvsroot/cello/ix-canvas.lisp 2006/06/05 01:47:49 1.3 +++ /project/cello/cvsroot/cello/ix-canvas.lisp 2006/07/06 22:09:10 1.4 @@ -156,7 +156,7 @@ (target-res self) (cs-logical-screen-resolution)))) -(eval-when (compile load eval) +(eval-now! (export '(ix-canvas target-res))) --- /project/cello/cvsroot/cello/ix-family.lisp 2006/06/05 01:47:49 1.3 +++ /project/cello/cvsroot/cello/ix-family.lisp 2006/07/06 22:09:10 1.4 @@ -16,7 +16,7 @@ (in-package :cello) -(eval-when (compile load eval) +(eval-now! (export '(a-stack a-row))) --- /project/cello/cvsroot/cello/ix-layer-expand.lisp 2006/06/11 13:32:24 1.5 +++ /project/cello/cvsroot/cello/ix-layer-expand.lisp 2006/07/06 22:09:10 1.6 @@ -253,8 +253,8 @@ ;;for dbg = (and (eql dx 1)(eql dy 1)(not no-turn-p)) do (destructuring-bind (xyn0 ix0 iy0 ox0 oy0) (cons (+ (if oc (/ theta 2) 0) - (case dx (1 (case dy (1 0)(-1 (/ pi -2)))) - (-1 (case dy (1 (/ pi 2))(-1 pi))))) + (ecase dx (1 (ecase dy (1 0)(-1 (/ pi -2)))) + (-1 (ecase dy (1 (/ pi 2))(-1 pi))))) (if oc (case (* dx dy) (1 (list (* dx ix)(* dy by)(* dx ox)(* dy by))) --- /project/cello/cvsroot/cello/ix-opengl.lisp 2006/07/03 00:35:12 1.2 +++ /project/cello/cvsroot/cello/ix-opengl.lisp 2006/07/06 22:09:10 1.3 @@ -17,10 +17,6 @@ (in-package :cello) -(defgeneric ogl-dsp-list-prep (self) - (:method-combination progn) - (:documentation "Do stuff needed before render but not needed/wanted in display list")) - (defmethod ogl-dsp-list-prep progn (self) (declare (ignore self)) (assert (not *ogl-listing-p*))) --- /project/cello/cvsroot/cello/ix-text.lisp 2006/07/03 00:35:12 1.7 +++ /project/cello/cvsroot/cello/ix-text.lisp 2006/07/06 22:09:10 1.8 @@ -58,7 +58,8 @@ (lr :initform (c? (^lr-width (+ (cond ((char-mask self) (ix-string-width self (char-mask self))) ((^text-width)) - ((ix-string-width self (char-mask self)))) + ((^maxcharwidth)) + (t (error "Please specify a font or :lr <n>."))) (* 2 (inset-h self)))))) (lb :initform (c? (downs 0 (font-descent (text-font self)) (inset-v self)))) ) --- /project/cello/cvsroot/cello/ix-togl.lisp 2006/07/03 00:35:12 1.2 +++ /project/cello/cvsroot/cello/ix-togl.lisp 2006/07/06 22:09:10 1.3 @@ -16,7 +16,7 @@ (in-package :cello) -(eval-when (compile load eval) +(eval-now! (export '(ix-togl-event-handler))) ;------------- Window --------------- --- /project/cello/cvsroot/cello/nehe-06.lisp 2006/07/03 00:35:12 1.6 +++ /project/cello/cvsroot/cello/nehe-06.lisp 2006/07/06 22:09:10 1.7 @@ -171,7 +171,7 @@ (setf *skin6* (mgk:wand-ensure-typed 'wand-texture (test-image "jmcbw512" "jpg"))) (setf *grace* (mgk:wand-ensure-typed 'wand-pixels - (test-image "grace" "jpg")))) ; "turing" "gif")))) + (test-image "graceblue" "jpg")))) ; "turing" "gif")))) (defun print-frame-rate (window) (with-slots (frame-count t0) window

1 0

[cello-cvs] CVS cello/cffi-extender
by ktilton 06 Jul '06

06 Jul '06

Update of /project/cello/cvsroot/cello/cffi-extender In directory clnet:/tmp/cvs-serv9972/cffi-extender Modified Files: arrays.lisp callbacks.lisp definers.lisp my-uffi-compat.lisp Log Message: --- /project/cello/cvsroot/cello/cffi-extender/arrays.lisp 2006/06/04 00:09:53 1.1 +++ /project/cello/cvsroot/cello/cffi-extender/arrays.lisp 2006/07/06 22:09:10 1.2 @@ -185,7 +185,7 @@ (defmacro fgn-pa (pa n) `(mem-aref ,pa :pointer ,n)) -(eval-when (compile load eval) +(eval-when (:compile-toplevel :load-toplevel :execute) (export '(ffx-reset ff-elt ff-list eltf eltd elti fgn-pa --- /project/cello/cvsroot/cello/cffi-extender/callbacks.lisp 2006/06/04 00:09:53 1.1 +++ /project/cello/cvsroot/cello/cffi-extender/callbacks.lisp 2006/07/06 22:09:10 1.2 @@ -67,7 +67,7 @@ -(eval-when (compile load eval) +(eval-when (:compile-toplevel :load-toplevel :execute) (export '(ff-register-callable ff-defun-callable ff-pointer-address))) \ No newline at end of file --- /project/cello/cvsroot/cello/cffi-extender/definers.lisp 2006/06/04 00:09:53 1.1 +++ /project/cello/cvsroot/cello/cffi-extender/definers.lisp 2006/07/06 22:09:10 1.2 @@ -22,7 +22,7 @@ (in-package :ffx) -(eval-when (compile load eval) +(eval-when (:compile-toplevel :load-toplevel :execute) (export '( defun-ffx defun-ffx-multi dffr --- /project/cello/cvsroot/cello/cffi-extender/my-uffi-compat.lisp 2006/06/04 00:09:53 1.1 +++ /project/cello/cvsroot/cello/cffi-extender/my-uffi-compat.lisp 2006/07/06 22:09:10 1.2 @@ -1,6 +1,6 @@ (in-package :ffx) -(eval-when (compile load eval) +(eval-when (:compile-toplevel :load-toplevel :execute) (export '(falloc))) ;;;(defun deref-array (array type position)

1 0