June 2005 - cello-cvs@common-lisp.net - mailman3.common-lisp.net

[cello-cvs] CVS update: cl-opengl/glut-osx/ogl-macros.lisp
by ktilton＠common-lisp.net 18 Jun '05

18 Jun '05

Update of /project/cello/cvsroot/cl-opengl/glut-osx In directory common-lisp.net:/tmp/cvs-serv6745/glut-osx Added Files: ogl-macros.lisp Log Message: OSX merge Date: Sat Jun 18 16:56:47 2005 Author: ktilton

1 0

[cello-cvs] CVS update: cl-opengl/glut-osx/glut-execute.lisp cl-opengl/glut-osx/glut-ftgl.lisp cl-opengl/glut-osx/glut-magick.lisp cl-opengl/glut-osx/openmcl-init.lisp cl-opengl/glut-osx/tools-init.lisp
by ktilton＠common-lisp.net 17 Jun '05

17 Jun '05

Update of /project/cello/cvsroot/cl-opengl/glut-osx In directory common-lisp.net:/tmp/cvs-serv28605/glut-osx Added Files: glut-execute.lisp glut-ftgl.lisp glut-magick.lisp openmcl-init.lisp tools-init.lisp Log Message: OSX merge Date: Fri Jun 17 02:17:09 2005 Author: ktilton

1 0

[cello-cvs] CVS update: Directory change: cl-opengl/glut-osx
by ktilton＠common-lisp.net 17 Jun '05

17 Jun '05

Update of /project/cello/cvsroot/cl-opengl/glut-osx In directory common-lisp.net:/tmp/cvs-serv27737/glut-osx Log Message: Directory /project/cello/cvsroot/cl-opengl/glut-osx added to the repository Date: Fri Jun 17 02:14:46 2005 Author: ktilton New directory cl-opengl/glut-osx added

1 0

[cello-cvs] CVS update: cl-opengl/cl-opengl-config.lisp cl-opengl/cl-opengl.lpr cl-opengl/glu-functions.lisp cl-opengl/ogl-utils.lisp
by ktilton＠common-lisp.net 15 Jun '05

15 Jun '05

Update of /project/cello/cvsroot/cl-opengl In directory common-lisp.net:/tmp/cvs-serv25325 Modified Files: cl-opengl-config.lisp cl-opengl.lpr glu-functions.lisp ogl-utils.lisp Log Message: OSX merge Date: Wed Jun 15 23:09:09 2005 Author: ktilton Index: cl-opengl/cl-opengl-config.lisp diff -u cl-opengl/cl-opengl-config.lisp:1.1 cl-opengl/cl-opengl-config.lisp:1.2 --- cl-opengl/cl-opengl-config.lisp:1.1 Wed May 25 05:14:30 2005 +++ cl-opengl/cl-opengl-config.lisp Wed Jun 15 23:09:09 2005 @@ -39,6 +39,6 @@ (defparameter *glut-dynamic-lib* (make-pathname #+lispworks :host #-lispworks :device "c" - :directory '(:absolute "cell-cultures" "cell-cultures-user" "dynlib") + :directory '(:absolute "0dev" "user" "dynlib") :name "freeglut" :type "dll")) Index: cl-opengl/cl-opengl.lpr diff -u cl-opengl/cl-opengl.lpr:1.1 cl-opengl/cl-opengl.lpr:1.2 --- cl-opengl/cl-opengl.lpr:1.1 Wed May 25 05:14:30 2005 +++ cl-opengl/cl-opengl.lpr Wed Jun 15 23:09:09 2005 @@ -1,4 +1,4 @@ -;; -*- lisp-version: "7.0 [Windows] (May 6, 2005 8:25)"; cg: "1.54.2.17"; -*- +;; -*- lisp-version: "7.0 [Windows] (Jun 10, 2005 13:34)"; cg: "1.54.2.17"; -*- (in-package :cg-user) Index: cl-opengl/glu-functions.lisp diff -u cl-opengl/glu-functions.lisp:1.1 cl-opengl/glu-functions.lisp:1.2 --- cl-opengl/glu-functions.lisp:1.1 Wed May 25 05:14:31 2005 +++ cl-opengl/glu-functions.lisp Wed Jun 15 23:09:09 2005 @@ -167,6 +167,7 @@ glenum type :void *data)) + (defun-ogl :void "gl-util" "gluCylinder" (:void *qobj gldouble base-radius gldouble top-radius gldouble height @@ -197,8 +198,8 @@ ;;;(defun-ogl GLUtesselator *"gl-util" "gluNewTess" ()) ;;;(defun-ogl void "gl-util" "gluNextContour" (GLUtesselator *tess GLenum type)) -;;;(defun-ogl :void "gl-util" "gluOrtho2D" (GLdouble left GLdouble right -;;; GLdouble bottom GLdouble top)) +(defun-ogl :void "gl-util" "gluOrtho2D" (GLdouble left GLdouble right + GLdouble bottom GLdouble top)) ;;;(defun-ogl void "gl-util" "gluPartialDisk" (GLUquadric *quad GLdouble inner GLdouble outer GLint slices GLint loops GLdouble start GLdouble sweep)) Index: cl-opengl/ogl-utils.lisp diff -u cl-opengl/ogl-utils.lisp:1.1 cl-opengl/ogl-utils.lisp:1.2 --- cl-opengl/ogl-utils.lisp:1.1 Wed May 25 05:14:31 2005 +++ cl-opengl/ogl-utils.lisp Wed Jun 15 23:09:09 2005 @@ -27,6 +27,8 @@ (in-package :cl-opengl) (defun ogl-tex-activate (tex-name) + (assert tex-name) + ;;(print `(ogl-tex-activate doing ,tex-name)) (gl-bind-texture gl_texture_2d tex-name) (gl-enable gl_texture_2d) (gl-polygon-mode gl_front_and_back gl_fill) ;; just front?

1 0

[cello-cvs] CVS update: cl-openal/altypes.lisp cl-openal/cl-openal-config.lisp cl-openal/cl-openal-demo.lisp cl-openal/cl-openal-init.lisp cl-openal/cl-openal.lpr cl-openal/cl-opengl-config.lisp cl-openal/wav-handling.lisp
by ktilton＠common-lisp.net 15 Jun '05

15 Jun '05

Update of /project/cello/cvsroot/cl-openal In directory common-lisp.net:/tmp/cvs-serv25298 Modified Files: altypes.lisp cl-openal-config.lisp cl-openal-demo.lisp cl-openal-init.lisp cl-openal.lpr cl-opengl-config.lisp wav-handling.lisp Log Message: OSX merge Date: Wed Jun 15 23:08:42 2005 Author: ktilton Index: cl-openal/altypes.lisp diff -u cl-openal/altypes.lisp:1.1 cl-openal/altypes.lisp:1.2 --- cl-openal/altypes.lisp:1.1 Fri May 27 21:10:29 2005 +++ cl-openal/altypes.lisp Wed Jun 15 23:08:42 2005 @@ -24,6 +24,7 @@ (dft al-bitfield #-allegro-v5.0.1 :unsigned-int #+allegro-v5.0.1 :int integer) (dft al-int :int integer) +(dft al-sizei :int integer) (dft al-uint #-allegro-v5.0.1 :unsigned-int #+allegro-v5.0.1 :int integer) (dft al-ushort #-allegro-v5.0.1 :unsigned-int #+allegro-v5.0.1 :int integer) Index: cl-openal/cl-openal-config.lisp diff -u cl-openal/cl-openal-config.lisp:1.1 cl-openal/cl-openal-config.lisp:1.2 --- cl-openal/cl-openal-config.lisp:1.1 Fri May 27 21:10:29 2005 +++ cl-openal/cl-openal-config.lisp Wed Jun 15 23:08:42 2005 @@ -23,17 +23,19 @@ (in-package :cl-openal) (defparameter *al-dynamic-lib* - (make-pathname #+lispworks :host #-lispworks :device "c" - :directory '(:absolute "windows" "system32") - :name "openal32" - :type "dll")) + #+darwin + (make-pathname :directory '(:absolute "Library" "Frameworks" "OpenAL.framework") + :name "OpenAL") + #-darwin + (make-pathname :directory '(:absolute "windows" "system32") + :name "openal32" + :type "dll")) (defparameter *alut-dynamic-lib* - (make-pathname :directory '(:absolute "cell-cultures" "cell-cultures-user" "dynlib") + (make-pathname :directory '(:absolute "0dev" "user" "dynlib") :name "alut" :type "dll")) (defparameter *audio-files* (make-pathname - :directory '(:absolute "cell-cultures" "cell-cultures-user" - "sounds") + :directory '(:absolute "cell-cultures" "user" "sounds") :type "wav")) Index: cl-openal/cl-openal-demo.lisp diff -u cl-openal/cl-openal-demo.lisp:1.1 cl-openal/cl-openal-demo.lisp:1.2 --- cl-openal/cl-openal-demo.lisp:1.1 Fri May 27 21:10:29 2005 +++ cl-openal/cl-openal-demo.lisp Wed Jun 15 23:08:42 2005 @@ -4,7 +4,8 @@ (defparameter g-buffers (fgn-alloc 'al-uint num_buffers)) (defun cl-openal-test () - (let ((w$ (list "/cell-cultures/cell-cultures-user/sounds/click2.wav" ))) + (let ((w$ (list "/0dev/user/sounds/jshootme.wav" ))) + (cl-openal-init) (apply 'wav-play-till-end (lambda (dur sources) (loop for source in sources Index: cl-openal/cl-openal-init.lisp diff -u cl-openal/cl-openal-init.lisp:1.1 cl-openal/cl-openal-init.lisp:1.2 --- cl-openal/cl-openal-init.lisp:1.1 Fri May 27 21:10:29 2005 +++ cl-openal/cl-openal-init.lisp Wed Jun 15 23:08:42 2005 @@ -43,7 +43,7 @@ :module "openal") () "Failed to load OpenAL dynamic lib ~a" *al-dynamic-lib*) - + #-darwin (assert (uffi:load-foreign-library *alut-dynamic-lib* :force-load #+lispworks nil #-lispworks t :module "alut") Index: cl-openal/cl-openal.lpr diff -u cl-openal/cl-openal.lpr:1.1 cl-openal/cl-openal.lpr:1.2 --- cl-openal/cl-openal.lpr:1.1 Fri May 27 21:10:29 2005 +++ cl-openal/cl-openal.lpr Wed Jun 15 23:08:42 2005 @@ -1,4 +1,4 @@ -;; -*- lisp-version: "7.0 [Windows] (May 6, 2005 8:25)"; cg: "1.54.2.17"; -*- +;; -*- lisp-version: "7.0 [Windows] (Jun 10, 2005 13:34)"; cg: "1.54.2.17"; -*- (in-package :cg-user) @@ -16,8 +16,7 @@ (make-instance 'module :name "cl-openal-init.lisp") (make-instance 'module :name "wav-handling.lisp") (make-instance 'module :name "cl-openal-demo.lisp")) - :projects (list (make-instance 'project-module :name - "\\0dev\\hello-c\\hello-c")) + :projects nil :libraries nil :distributed-files nil :internally-loaded-files nil Index: cl-openal/cl-opengl-config.lisp diff -u cl-openal/cl-opengl-config.lisp:1.1 cl-openal/cl-opengl-config.lisp:1.2 --- cl-openal/cl-opengl-config.lisp:1.1 Fri May 27 21:10:29 2005 +++ cl-openal/cl-opengl-config.lisp Wed Jun 15 23:08:42 2005 @@ -39,5 +39,5 @@ (setq *glut-dynamic-lib* (merge-pathnames (make-pathname :name "freeglut" :type "dll") - cl-user::*cell-cultures-dynlib-directory*)) + cl-user::*user-dynlib-directory*)) Index: cl-openal/wav-handling.lisp diff -u cl-openal/wav-handling.lisp:1.1 cl-openal/wav-handling.lisp:1.2 --- cl-openal/wav-handling.lisp:1.1 Fri May 27 21:10:29 2005 +++ cl-openal/wav-handling.lisp Wed Jun 15 23:08:42 2005 @@ -31,19 +31,19 @@ (al-chk "al-Gen-Sources") (prog1 (loop for n below count - collecting (progn (assert (plusp (fgn-pa sources n))) - (fgn-pa sources n))) + collecting (progn (assert (plusp (elti sources n))) + (elti sources n))) (fgn-free sources))))) (defun al-source-free (sources) (let* ((sct (if (listp sources) (length sources) 1)) (sv (fgn-alloc 'al-uint sct))) - (if (> sct 1) + (if (listp sources) (loop for s in sources - and n below sct - do (setf (fgn-pa sv n) s)) - (setf (fgn-pa sv 0) sources)) + and n below sct + do (setf (elti sv n) s)) + (setf (elti sv 0) sources)) (al-delete-sources sct sv) (fgn-free sv))) @@ -91,7 +91,8 @@ (al-chk "wav-to-buffer al-gen-buffer") (unwind-protect - (with-cstring (f$ (namestring wav-path)) + (#-openmcl with-cstrings #+openmcl ccl::with-cstrs ;; hunh? + ((f$ (namestring wav-path))) (alut-load-wav-file f$ format datahandle size freq loop) (al-chk " wav-to-buffer alut-load-wav-File") @@ -102,18 +103,21 @@ :freq (fgn-pa freq 0) :loop (fgn-pa loop 0))) - (when (null-pointer-p (elti datahandle 0)) + (when (null-pointer-p (fgn-pa datahandle 0)) ;; 04-11-14 was elti, bad for OpenMCL + (break "null-pointer-p datahandle ~a" datahandle) (return-from wav-to-buffer nil)) - (al-buffer-data (fgn-pa buffer 0) (elti format 0) (fgn-pa datahandle 0) - (elti size 0)(elti freq 0)) + (print (list :buffering-data (elti buffer 0) (elti format 0) (fgn-pa datahandle 0) + (elti size 0)(elti freq 0))) + (al-buffer-data (elti buffer 0) (elti format 0) (fgn-pa datahandle 0) + (elti size 0)(elti freq 0)) (al-chk "al-buffer-data") (alut-unload-wav (elti format 0)(fgn-pa datahandle 0) (elti size 0)(elti freq 0)) (al-chk "alut-unload-wav") - - (fgn-pa buffer 0)) + (format t "~&buffer is ~a" (elti buffer 0)) + (elti buffer 0)) (fgn-free buffer) (fgn-free format) (fgn-free datahandle) @@ -122,8 +126,8 @@ (fgn-free loop))))) (defun source-buffer-load (source buffer) - (assert (plusp source)) - (assert (plusp buffer)) + ; (assert (plusp source)) + ; (assert (plusp buffer)) (al-source-stop source) (al-chk "al-Source-Stop") @@ -131,4 +135,4 @@ (al-sourcei source al_buffer buffer) (al-chk "al-Sourcei AL_BUFFER") - source) \ No newline at end of file + source)

1 0

[cello-cvs] CVS update: cl-magick/cl-magick-config.lisp cl-magick/cl-magick.lisp cl-magick/mgk-test.lisp cl-magick/wand-pixels.lisp cl-magick/wand-texture.lisp
by ktilton＠common-lisp.net 15 Jun '05

15 Jun '05

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)

1 0

[cello-cvs] CVS update: cl-ftgl/cl-ftgl-config.lisp cl-ftgl/cl-ftgl.lisp
by ktilton＠common-lisp.net 15 Jun '05

15 Jun '05

Update of /project/cello/cvsroot/cl-ftgl In directory common-lisp.net:/tmp/cvs-serv25239 Modified Files: cl-ftgl-config.lisp cl-ftgl.lisp Log Message: OSX merge Date: Wed Jun 15 23:07:28 2005 Author: ktilton Index: cl-ftgl/cl-ftgl-config.lisp diff -u cl-ftgl/cl-ftgl-config.lisp:1.1 cl-ftgl/cl-ftgl-config.lisp:1.2 --- cl-ftgl/cl-ftgl-config.lisp:1.1 Tue May 31 16:28:59 2005 +++ cl-ftgl/cl-ftgl-config.lisp Wed Jun 15 23:07:28 2005 @@ -23,7 +23,7 @@ (in-package :cl-ftgl) (defparameter *ftgl-dynamic-lib-path* - (make-pathname :directory '(:absolute "cell-cultures" "cell-cultures-user" "dynlib") + (make-pathname :directory '(:absolute "0dev" "user" "dynlib") :name "ftgl_dynamic_MTD_d" :type "dll")) Index: cl-ftgl/cl-ftgl.lisp diff -u cl-ftgl/cl-ftgl.lisp:1.1 cl-ftgl/cl-ftgl.lisp:1.2 --- cl-ftgl/cl-ftgl.lisp:1.1 Tue May 31 16:28:59 2005 +++ cl-ftgl/cl-ftgl.lisp Wed Jun 15 23:07:28 2005 @@ -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/cl-ftgl/cl-ftgl.lisp,v 1.1 2005/05/31 14:28:59 ktilton Exp $ +;;; $Header: /project/cello/cvsroot/cl-ftgl/cl-ftgl.lisp,v 1.2 2005/06/15 21:07:28 ktilton Exp $ (defpackage #:cl-ftgl (:nicknames #:ftgl) @@ -167,13 +167,13 @@ (values *cl-ftgl-freetype-dll-filename*)) #+test -(cl-ftgl-test) +(cl-ftgl-test 'cl-ftgl-test-disp-fc) (defvar *start*) (defvar *frames*) (defun now () (/ (get-internal-real-time) internal-time-units-per-second)) -(defun cl-ftgl-test () +(defun cl-ftgl-test (&optional (disp-fn 'cl-ftgl-test-disp-fc)) (setf *start* (now) *frames* 0) (cl-ftgl-reset) @@ -181,7 +181,7 @@ (mapcar (lambda (mode) (cons mode (ftgl-make mode *gui-style-default-face* 48 96 18))) '(:texture :pixmap :bitmap :outline :polygon :extruded))) - (ogl::lesson-14 'cl-ftgl-test-disp-fc)) + (ogl::lesson-14 disp-fn)) (defun test-font (mode) (cdr (assoc mode *test-fonts*))) @@ -363,7 +363,7 @@ () "CL-FTGL::CL-FTGL-INIT *** FTGL FREETYPE SHLIB COULD NOT BE LOADED FROM ~a !" *cl-ftgl-freetype-dll-full-filename*)) - (ukt::Trc "!!!! Loading FTGL") + (print "!!!! Loading FTGL") (setq *ftgl-dll* (uffi:load-foreign-library *cl-ftgl-dll-full-filename* :force-load #+lispworks t #-lispworks nil

1 0