Update of /project/cello/cvsroot/cl-magick In directory common-lisp.net:/tmp/cvs-serv25262

Modified Files: cl-magick-config.lisp cl-magick.lisp mgk-test.lisp wand-pixels.lisp wand-texture.lisp Log Message: OSX merge Date: Wed Jun 15 23:08:02 2005 Author: ktilton

Index: cl-magick/cl-magick-config.lisp diff -u cl-magick/cl-magick-config.lisp:1.1 cl-magick/cl-magick-config.lisp:1.2 --- cl-magick/cl-magick-config.lisp:1.1 Wed May 25 13:31:23 2005 +++ cl-magick/cl-magick-config.lisp Wed Jun 15 23:08:02 2005 @@ -30,7 +30,7 @@ (defparameter *magick-dynamic-lib* (make-pathname #+lispworks :host #-lispworks :device "c" - :directory '(:absolute "cell-cultures" "cell-cultures-user" "dynlib") + :directory '(:absolute "0dev" "user" "dynlib") :name "CORE_RL_wand_" :type "dll"))

Index: cl-magick/cl-magick.lisp diff -u cl-magick/cl-magick.lisp:1.1 cl-magick/cl-magick.lisp:1.2 --- cl-magick/cl-magick.lisp:1.1 Wed May 25 13:31:23 2005 +++ cl-magick/cl-magick.lisp Wed Jun 15 23:08:02 2005 @@ -24,12 +24,12 @@ (:nicknames :mgk) (:use #:common-lisp - #-cormanlisp #:clos + #-(or cormanlisp ccl) #:clos #:hello-c #+cl-opengl #:cl-opengl ;; wands as opengl textures ) - (:export #:wand-ensure-typed + (:export #:wand-manager #:wand-ensure-typed #:wands-clear #:wand-pixels #:wand-texture #:wand-render #:image-size #:wand-texture-activate #:xim @@ -46,7 +46,7 @@ (defun magick-wand-template () (path-to-wand (make-pathname - :directory '(:absolute "cell-cultures" "cell-cultures-user" + :directory '(:absolute "0dev" "user" "graphics" "templates") :name "metal" :type "gif")))

Index: cl-magick/mgk-test.lisp diff -u cl-magick/mgk-test.lisp:1.1 cl-magick/mgk-test.lisp:1.2 --- cl-magick/mgk-test.lisp:1.1 Wed May 25 13:31:23 2005 +++ cl-magick/mgk-test.lisp Wed Jun 15 23:08:02 2005 @@ -23,10 +23,9 @@

(in-package :cl-magick)

- -#+cello (defun mgk-wand-dump (w &rest info) - (ukt::trc "mgk-wand-dump" w info) + (declare (ignorable w)) + #+not (trc "mgk-wand-dump" w info) ;; (ukt::trc "> width" (magick-get-image-width w)) ;; (ukt::trc "> height" (magick-get-image-height w)) ;; (ukt::trc "> description" (magick-describe-image w)) @@ -264,7 +263,7 @@

(defun test-image (filename filetype) (make-pathname - :directory '(:absolute "cell-cultures" "cell-cultures-user" "graphics" "shapers") + :directory '(:absolute "0dev" "user" "graphics" "shapers") :name (string filename) :type (string filetype)))

Index: cl-magick/wand-pixels.lisp diff -u cl-magick/wand-pixels.lisp:1.1 cl-magick/wand-pixels.lisp:1.2 --- cl-magick/wand-pixels.lisp:1.1 Wed May 25 13:31:23 2005 +++ cl-magick/wand-pixels.lisp Wed Jun 15 23:08:02 2005 @@ -39,12 +39,12 @@ "only works in ortho mode I think; abstract out raster-pos for perspective" (declare (ignorable right left)) (assert (pixels self)) - (ukt::trc nil "!!!! pixelrender entry rasterpos:" + #+not (trc nil "!!!! pixelrender entry rasterpos:" (ogl-raster-pos-get) :lrtb (list left right top bottom) :image-sz sz) (let ((y-move (downs (+ 0 (abs (- top bottom)))))) (with-bitmap-shifted (0 y-move) - ;;(ukt::trc nil "wand-render pixels move" 0 y-move :top top :bottom bottom) + ;; (trc nil "wand-render pixels move" 0 y-move :top top :bottom bottom) #+hush (if (ogl-get-boolean gl_current_raster_position_valid) (progn @@ -68,7 +68,7 @@ ;(gl-enable gl_blend) ;; debugging try (gl-blend-func gl_src_alpha gl_one_minus_src_alpha) (gl-polygon-mode gl_front_and_back gl_fill) - (cells::trc nil "wand-pixelling" (ogl-raster-pos-get)) + #+not (trc nil "wand-pixelling" (ogl-raster-pos-get))

(gl-draw-pixels (car sz) (cdr sz) gl_rgb gl_unsigned_byte (pixels self))

Index: cl-magick/wand-texture.lisp diff -u cl-magick/wand-texture.lisp:1.1 cl-magick/wand-texture.lisp:1.2 --- cl-magick/wand-texture.lisp:1.1 Wed May 25 13:31:23 2005 +++ cl-magick/wand-texture.lisp Wed Jun 15 23:08:02 2005 @@ -72,7 +72,7 @@ (cdr (image-size self))))) ;; (assert (not *ogl-listing-p*)) (assert (plusp tx)) - (ukt::trc "!!!!wand-image-to-texture genning new tx:" tx) + ;; (trc "!!!!wand-image-to-texture genning new tx: ~a" tx) (gl-bind-texture gl_texture_2d tx)

(progn ;; useless?? @@ -96,7 +96,7 @@

(defmethod wand-render ((self wand-texture) left top right bottom &aux (sz (image-size self))) - (ukt::trc nil "wand-render tex-name:" (texture-name self) (tile-p self) self + #+not (trc nil "wand-render tex-name:" (texture-name self) (tile-p self) self :size sz :bbox (list left top right bottom))

(with-attrib (gl_texture_bit);; gl_enable_bit gl_hint_bit gl_line_bit gl_color_buffer_bit)