Update of /project/cello/cvsroot/cello/cl-magick In directory clnet:/tmp/cvs-serv8567/cl-magick
Modified Files: cl-magick.lisp cl-magick.lpr wand-texture.lisp Log Message: Cello Rizing. cl-opengl becomes kt-opengl, hello-cffi becomes cffi-extender, end lots more to come
--- /project/cello/cvsroot/cello/cl-magick/cl-magick.lisp 2006/05/17 16:14:29 1.1 +++ /project/cello/cvsroot/cello/cl-magick/cl-magick.lisp 2006/05/26 22:08:56 1.2 @@ -27,8 +27,8 @@ #-(or cormanlisp ccl) #:clos #:hello-c #:ffx - #+cl-opengl - #:cl-opengl ;; wands as opengl textures + #+kt-opengl + #:kt-opengl ;; wands as opengl textures ) (:export #:wand-manager #:wand-ensure-typed #:wands-clear #:wand-pixels #:wand-texture --- /project/cello/cvsroot/cello/cl-magick/cl-magick.lpr 2006/05/17 16:14:29 1.1 +++ /project/cello/cvsroot/cello/cl-magick/cl-magick.lpr 2006/05/26 22:08:56 1.2 @@ -1,4 +1,4 @@ -;; -*- lisp-version: "8.0 [Windows] (May 5, 2006 15:39)"; cg: "1.81"; -*- +;; -*- lisp-version: "8.0 [Windows] (May 22, 2006 0:51)"; cg: "1.81"; -*-
(in-package :cg-user)
@@ -13,8 +13,7 @@ (make-instance 'module :name "wand-image.lisp") (make-instance 'module :name "wand-texture.lisp") (make-instance 'module :name "wand-pixels.lisp")) - :projects (list (make-instance 'project-module :name - "..\cl-opengl\cl-opengl")) + :projects nil :libraries nil :distributed-files nil :internally-loaded-files nil --- /project/cello/cvsroot/cello/cl-magick/wand-texture.lisp 2006/05/17 16:14:29 1.1 +++ /project/cello/cvsroot/cello/cl-magick/wand-texture.lisp 2006/05/26 22:08:56 1.2 @@ -63,7 +63,7 @@ ;(print `(wand-texture-activate ,(texture-name wand))) (ogl-tex-activate (texture-name wand)))
- (defparameter *textures-1* (fgn-alloc 'cl-opengl::gluint 1 :ignore)) + (defparameter *textures-1* (fgn-alloc 'kt-opengl::gluint 1 :ignore)) (defun wand-image-to-texture (self) (let ((tx (ogl-texture-gen) #+not (progn (gl-gen-textures 1 *textures-1*) (ff-elt *textures-1* gluint 0))) @@ -88,7 +88,7 @@ (gllog :texture tx (* 3 (car (image-size self)) (cdr (image-size self))) :wim2tex) (gl-tex-image2d gl_texture_2d 0 3 (car (image-size self)) (cdr (image-size self)) 0 gl_rgb gl_unsigned_byte pixels) - (cl-opengl::glec :tex-image) + (kt-opengl::glec :tex-image) ;;(print `(wand-image-to-texture loaded texture sized ,(image-size self)))
(fgn-free pixels)