cello-cvs

cello-cvs@common-lisp.net

227 discussions

[cello-cvs] CVS cello/cl-magick
by fgoenninger 28 Aug '06

28 Aug '06

Update of /project/cello/cvsroot/cello/cl-magick In directory clnet:/tmp/cvs-serv21180 Modified Files: wand-image.lisp Log Message: Changed: Re-arranged class definition code (beautifying only). --- /project/cello/cvsroot/cello/cl-magick/wand-image.lisp 2006/08/22 16:12:35 1.5 +++ /project/cello/cvsroot/cello/cl-magick/wand-image.lisp 2006/08/28 18:42:26 1.6 @@ -23,12 +23,11 @@ (in-package :cl-magick) (defclass wand-image () - ((direction :initarg :direction :initform :input :accessor direction) - (file-path$ :initarg :file-path$ :accessor file-path$ :initform nil) - (mgk-wand :initarg :mgk-wand :accessor mgk-wand :initform nil) - (image-size :initarg :image-size :accessor image-size :initform nil) - (tile-p :initarg :tile-p :accessor tile-p :initform t) - )) + ((direction :initarg :direction :initform :input :accessor direction) + (file-path$ :initarg :file-path$ :initform nil :accessor file-path$) + (mgk-wand :initarg :mgk-wand :initform nil :accessor mgk-wand) + (image-size :initarg :image-size :initform nil :accessor image-size) + (tile-p :initarg :tile-p :initform t :accessor tile-p))) (defmethod initialize-instance :after ((self wand-image) &key) (ecase (direction self) @@ -47,7 +46,7 @@ "Image file ~a not found initializing wand" (file-path$ self)) (assert (not (mgk-wand self))) ;; make sure not leaking (setf (mgk-wand self) (path-to-wand (file-path$ self))) - ;(mgk-wand-dump (mgk-wand self) (file-path$ self)) + ;;(mgk-wand-dump (mgk-wand self) (file-path$ self)) (when (and (mgk-wand self) (not (image-size self))) (setf (image-size self) (cons (magick-get-image-width (mgk-wand self)) @@ -79,9 +78,11 @@ (fgn-alloc :unsigned-long 1 :ignore)) (defun wand-image-size (wand) - (magick-get-size wand *mgk-columns* *mgk-rows*) + (magick-get-size wand + *mgk-columns* + *mgk-rows*) (cons (ff-elt *mgk-columns* :unsigned-long 0) - (ff-elt *mgk-rows* :unsigned-long 0))) + (ff-elt *mgk-rows* :unsigned-long 0))) (defun wand-get-image-pixels (wand &optional (first-col 0) (first-row 0) @@ -99,15 +100,10 @@ (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)) - (cells:trc nil "image format" wand (magick-get-image-format wand)) + ;;(print (list "wand-get-image-pixels got" wand (* 3 columns rows) pixels)) ;; frgo: debug ... + ;;(cells:trc "image format" wand (magick-get-image-format wand)) ;; frgo:debug... (magick-get-image-pixels wand first-col first-row columns rows "RGB" 0 pixels ) - #+testing (progn - (incf testn) - (print `(writeimage ,(magick-write-image wand (format nil "C:\\TEST~a.JPG" testn)))) - (print `(writeimage ,(magick-write-image wand (format nil "C:\\TEST~a.GIF" testn)))) - #+not (print `(writeimage ,(magick-write-image wand "C:\\TEST.BMP")))) - + ;;(print `(writeimage ,(magick-write-image wand "/tmp/wand-image-test.jpg"))) #+jesfoolinaround(loop for row below 16 do (loop for col below 16 by 1 for offset = (+ (* row columns 3) (* col 3))

1 0

[cello-cvs] CVS cello/cl-magick
by fgoenninger 28 Aug '06

28 Aug '06

Update of /project/cello/cvsroot/cello/cl-magick In directory clnet:/tmp/cvs-serv21072 Modified Files: wand-texture.lisp Log Message: Changed: Added some (now inactive) print statements for debugging only. --- /project/cello/cvsroot/cello/cl-magick/wand-texture.lisp 2006/08/23 20:20:27 1.5 +++ /project/cello/cvsroot/cello/cl-magick/wand-texture.lisp 2006/08/28 18:41:19 1.6 @@ -42,14 +42,14 @@ (grow-sz (cons (expt 2 (ceiling (log (car (image-size self)) 2))) (expt 2 (ceiling (log (cdr (image-size self)) 2))))) (best-fit-sz (best-fit-cons trunc-sz (image-size self) grow-sz))) - #+shh (print `(texture-name> gennning texture ,self)) + ;;(print `(texture-name> gennning texture ,self)) ;; frgo: debug... (unless (equal (image-size self) best-fit-sz) - #+shhh (print `(texture-name> tex-refit ,(image-size self) to ,best-fit-sz)) + ;;(print `(texture-name> tex-refit ,(image-size self) to ,best-fit-sz)) ;; frgo: debug... (magick-scale-image (mgk-wand self) (car best-fit-sz) (cdr best-fit-sz)) ;;; gaussian-filter 0) (setf (image-size self) best-fit-sz)) - #+shhh (print `(texture-name> new image size , self ,(image-size self))) + ;; (print `(texture-name> new image size , self ,(image-size self))) ;; frgo: debug... (let ((tx (wand-image-to-texture self))) (if (plusp tx) (setf (texture-name self) tx) @@ -57,19 +57,20 @@ (defun wand-texture-activate (wand) - ;(print `(wand-texture-activate ,(texture-name wand))) + ;;(print `(wand-texture-activate ,(texture-name wand))) (ogl-tex-activate (texture-name wand))) (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))) (pixels (wand-get-image-pixels (mgk-wand self) 0 0 (car (image-size self)) (cdr (image-size self))))) - ;; (assert (not *ogl-listing-p*)) + ;;(assert (not *ogl-listing-p*)) (assert (plusp tx)) - ;; (cells:trc "!!!!wand-image-to-texture genning new tx: ~a" tx) + ;;(cells:trc "!!!!wand-image-to-texture genning new tx: ~a" tx) ;; frgo: debug... (gl-bind-texture gl_texture_2d tx) (progn ;; useless?? @@ -86,7 +87,7 @@ (gl-tex-image2d gl_texture_2d 0 3 (car (image-size self)) (cdr (image-size self)) 0 gl_rgb gl_unsigned_byte pixels) (kt-opengl::glec :tex-image) - ;;(print `(wand-image-to-texture loaded texture sized ,(image-size self))) + (print `(wand-image-to-texture loaded texture sized ,(image-size self))) ;; frgo: debug... (fgn-free pixels) tx))

1 0

[cello-cvs] CVS cello/kt-opengl
by fgoenninger 28 Aug '06

28 Aug '06

Update of /project/cello/cvsroot/cello/kt-opengl In directory clnet:/tmp/cvs-serv20733 Modified Files: kt-opengl.lisp Log Message: Changed: Use CFFI scheme to define and use foreign libs. --- /project/cello/cvsroot/cello/kt-opengl/kt-opengl.lisp 2006/08/25 08:39:26 1.4 +++ /project/cello/cvsroot/cello/kt-opengl/kt-opengl.lisp 2006/08/28 18:38:03 1.5 @@ -21,7 +21,7 @@ ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ;;; IN THE SOFTWARE. -;;; $Id: kt-opengl.lisp,v 1.4 2006/08/25 08:39:26 fgoenninger Exp $ +;;; $Id: kt-opengl.lisp,v 1.5 2006/08/28 18:38:03 fgoenninger Exp $ (pushnew :kt-opengl *features*) @@ -80,21 +80,22 @@ (defvar *selecting*) -(defparameter *gl-dynamic-lib* - (make-pathname - ;;#+lispworks :host #-lispworks :device "c" - :directory '(:absolute "windows" "system32") - :name "opengl32" - :type "dll")) - -(defparameter *glu-dynamic-lib* - (make-pathname - ;;#+lispworks :host #-lispworks :device "c" - :directory '(:absolute "windows" "system32") - :name "glu32" - :type "dll")) - -(defparameter *glut-dynamic-lib* :unconfigured) +(define-foreign-library OpenGL + (:windows (:or (namestring + (make-pathname + ;;#+lispworks :host #-lispworks :device "c" + :directory '(:absolute "windows" "system32") + :name "opengl32" + :type "dll")))) + (:darwin (:or (:framework "OpenGL")))) + +(define-foreign-library GLU + (:windows (:or (namestring + (make-pathname + ;;#+lispworks :host #-lispworks :device "c" + :directory '(:absolute "windows" "system32") + :name "opengl32" + :type "dll"))))) (defparameter *opengl-dll* nil)

1 0

[cello-cvs] CVS cello/kt-opengl
by fgoenninger 28 Aug '06

28 Aug '06

Update of /project/cello/cvsroot/cello/kt-opengl In directory clnet:/tmp/cvs-serv20456 Modified Files: ogl-macros.lisp Log Message: Changed: Now using CFFI scheme for defining and using foreign libs. --- /project/cello/cvsroot/cello/kt-opengl/ogl-macros.lisp 2006/08/21 04:28:29 1.6 +++ /project/cello/cvsroot/cello/kt-opengl/ogl-macros.lisp 2006/08/28 18:37:22 1.7 @@ -33,7 +33,6 @@ (defmacro with-matrix ((&optional load-identity-p) &body body) `(call-with-matrix ,load-identity-p (lambda () ,@body) ',body)) - (defun call-with-matrix (load-identity-p matrix-fn matrix-code) (declare (ignorable matrix-code)) (gl-push-matrix) @@ -98,6 +97,7 @@ (defvar *gl-begun*) (defvar *gl-stop*) + (defmacro with-gl-begun ((what) &body body) `(progn (when (boundp '*gl-begun*) @@ -123,24 +123,19 @@ (gl-translatef (- ,dx)(- ,dy)(- ,dz)))))) (defun kt-opengl-init () - (declare (ignorable load-oglfont-p)) (unless *opengl-dll* - #-mcl (progn - (print "loading open GL/GLU") - (cffi-uffi-compat:load-foreign-library - *gl-dynamic-lib* - :module "open-gl")) - #+mcl - (format t "~&We're on Darwin, so we do not load the OpenGL dynlib explicitely~%.") - #-mcl - (setf *opengl-dll* (cffi-uffi-compat:load-foreign-library *glu-dynamic-lib* - :module "gl-util")) - #+mcl - (setf *opengl-dll* t) - )) + (let ((opengl-loaded-p + (use-foreign-library OpenGL)) + (glu-loaded-p + #+macosx + t ;; on Mac OS X, no explicit loading of GLU needed. + #-macosx + (use-foreign-library GLU))) + (assert (and opengl-loaded-p glu-loaded-p)) + (setf *opengl-dll* t))))) -(eval-when (load eval) +(eval-when (:load-toplevel :execute) (kt-opengl-init)) (defun glec (&optional (id :anon))

1 0

[cello-cvs] CVS cello/kt-opengl
by fgoenninger 28 Aug '06

28 Aug '06

Update of /project/cello/cvsroot/cello/kt-opengl In directory clnet:/tmp/cvs-serv20116 Modified Files: ogl-utils.lisp Log Message: Added: Id for CVS info Changed: Done some code "beautifying" for myself being able to understand this better... --- /project/cello/cvsroot/cello/kt-opengl/ogl-utils.lisp 2006/08/24 17:35:08 1.5 +++ /project/cello/cvsroot/cello/kt-opengl/ogl-utils.lisp 2006/08/28 18:36:40 1.6 @@ -22,17 +22,16 @@ ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ;;; IN THE SOFTWARE. - +;;; $Id: ogl-utils.lisp,v 1.6 2006/08/28 18:36:40 fgoenninger Exp $ (in-package :kt-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? - ) + (gl-bind-texture gl_texture_2d tex-name) + (gl-polygon-mode gl_front_and_back gl_fill)) ;; just front ? (defparameter *textures-1* (fgn-alloc 'gluint 1 :ignore)) @@ -47,9 +46,15 @@ (glec :ogl-texture-gen) (ff-elt *textures-1* gluint 0)) -(let (gl-s-plane gl-t-plane gl-r-plane gl-q-plane) +(let ((gl-s-plane nil) + (gl-t-plane nil) + (gl-r-plane nil) + (gl-q-plane nil)) + (defun ogl-tex-gen-setup (mode tex-env tex-wrap scale &rest planes) - ;;(trc nil "ogl-tex-gen-setup:" mode tex-env tex-wrap scale planes) + + ;;(trc "ogl-tex-gen-setup:" mode tex-env tex-wrap scale planes) + (gl-tex-envf gl_texture_env gl_texture_env_mode tex-env) (gl-tex-parameterf gl_texture_2d gl_texture_min_filter gl_linear ) (gl-tex-parameterf gl_texture_2d gl_texture_mag_filter gl_linear ) @@ -58,23 +63,23 @@ (gl-tex-parameteri gl_texture_2d gl_texture_wrap_t tex-wrap) ;-- (loop for plane in planes - do (ecase plane - (:s (gl-tex-geni gl_s gl_texture_gen_mode mode) - (gl-tex-genfv gl_s gl_object_plane - (ff-floatv-ensure gl-s-plane scale 0 0 0)) - (gl-enable gl_texture_gen_s)) - (:tee (gl-tex-geni gl_t gl_texture_gen_mode mode) - (gl-tex-genfv gl_t gl_object_plane - (ff-floatv-ensure gl-t-plane 0 scale 0 0)) - (gl-enable gl_texture_gen_t)) - (:r (gl-tex-geni gl_r gl_texture_gen_mode mode) - (gl-tex-genfv gl_r gl_object_plane - (ff-floatv-ensure gl-r-plane 0 0 scale 0)) - (gl-enable gl_texture_gen_r)) - (:q (gl-tex-geni gl_q gl_texture_gen_mode mode) - (gl-tex-genfv gl_q gl_object_plane - (ff-floatv-ensure gl-q-plane 0 0 scale 0)) - (gl-enable gl_texture_gen_q)))))) + do (ecase plane + (:s (gl-tex-geni gl_s gl_texture_gen_mode mode) + (gl-tex-genfv gl_s gl_object_plane + (ff-floatv-ensure gl-s-plane scale 0 0 0)) + (gl-enable gl_texture_gen_s)) + (:tee (gl-tex-geni gl_t gl_texture_gen_mode mode) + (gl-tex-genfv gl_t gl_object_plane + (ff-floatv-ensure gl-t-plane 0 scale 0 0)) + (gl-enable gl_texture_gen_t)) + (:r (gl-tex-geni gl_r gl_texture_gen_mode mode) + (gl-tex-genfv gl_r gl_object_plane + (ff-floatv-ensure gl-r-plane 0 0 scale 0)) + (gl-enable gl_texture_gen_r)) + (:q (gl-tex-geni gl_q gl_texture_gen_mode mode) + (gl-tex-genfv gl_q gl_object_plane + (ff-floatv-ensure gl-q-plane 0 0 scale 0)) + (gl-enable gl_texture_gen_q)))))) (defun ogl-scissor-box () (let ((box (fgn-alloc 'glint 4 :scissor)))

1 0

[cello-cvs] CVS cello/cl-magick
by fgoenninger 26 Aug '06

26 Aug '06

Update of /project/cello/cvsroot/cello/cl-magick In directory clnet:/tmp/cvs-serv28823 Modified Files: cl-magick.lisp Log Message: Changed: Loading of dynamic libs now safe also on OS X. --- /project/cello/cvsroot/cello/cl-magick/cl-magick.lisp 2006/08/23 21:10:31 1.8 +++ /project/cello/cvsroot/cello/cl-magick/cl-magick.lisp 2006/08/26 21:46:21 1.9 @@ -20,12 +20,7 @@ ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ;;; IN THE SOFTWARE. -#+asdf -(eval-when (:load-toplevel :compile-toplevel) - (asdf:operate 'asdf:load-op 'cffi) - (asdf:operate 'asdf:load-op 'cffi-extender) - (asdf:operate 'asdf:load-op 'kt-opengl) - (asdf:operate 'asdf:load-op 'gui-geometry)) +;;; $Id: cl-magick.lisp,v 1.9 2006/08/26 21:46:21 fgoenninger Exp $ (defpackage :cl-magick (:nicknames :mgk) @@ -64,9 +59,9 @@ (path-to-wand (or *wand-template* (make-pathname - :directory '(:absolute "0dev" "user" - "graphics" "templates") - :name "metal" :type "gif")))) +#-macosx :directory '(:absolute "0dev" "user" "graphics" "templates") +#+macosx :directory '(:absolute "Users" "frgo" "Pictures") + :name "metal003" :type "gif")))) (defparameter *imagick-dll-loaded* nil) (defparameter *wands-loaded* nil) @@ -81,15 +76,6 @@ (cffi:define-foreign-library Wand (:darwin (:or "/usr/local/lib/libWand.dylib"))) -;; Order matters! First, load Wand then Magick on Darwin -#+macosx -(eval-when (:load-toplevel :execute) - (cffi:use-foreign-library Wand)) - -(eval-when (:load-toplevel :execute) - (cffi:use-foreign-library Magick)) - - ;------------------------------------------------------------------- (defun cl-magick-init () @@ -97,9 +83,13 @@ (progn ;(print "clearing magick wands") ;(wands-clear) + + ;; Order matters! First, load Wand then Magick on Darwin + #+macosx + (cffi:use-foreign-library Wand) - (assert (setq *imagick-dll-loaded* t - #+not (cffi:use-foreign-library magick)) + (assert (setq *imagick-dll-loaded* + (cffi:use-foreign-library Magick)) () "Unable to load imagick" ) (print `(magick-copyright ,(magick-get-copyright))) (print `(magick-version ,(magick-get-version *mgk-version*))) @@ -142,4 +132,3 @@ (print `(unloading foreign library ,dll)) (setf *imagick-dll-loaded* nil) (ff:unload-foreign-library dll)))) -

1 0

[cello-cvs] CVS cello/cl-magick
by fgoenninger 26 Aug '06

26 Aug '06

Update of /project/cello/cvsroot/cello/cl-magick In directory clnet:/tmp/cvs-serv28788 Modified Files: cl-magick.asd Log Message: Changed: Depends-on extended. Now loads dependencies also. --- /project/cello/cvsroot/cello/cl-magick/cl-magick.asd 2006/07/06 22:09:11 1.2 +++ /project/cello/cvsroot/cello/cl-magick/cl-magick.asd 2006/08/26 21:45:22 1.3 @@ -16,12 +16,12 @@ :licence "MIT" :description "Bindings for ImageMagick" :long-description "Poorly implemented bindings to half of ImageMagick" - :depends-on (gui-geometry) + :depends-on (:cffi :cffi-extender :utils-kt :gui-geometry :kt-opengl) :components ((:file "cl-magick") - (:file "magick-wand" :depends-on ("cl-magick")) + (:file "magick-wand" :depends-on ("cl-magick")) (:file "drawing-wand" :depends-on ("magick-wand")) - (:file "pixel-wand" :depends-on ("drawing-wand")) - (:file "mgk-utils" :depends-on ("pixel-wand")) - (:file "wand-image" :depends-on ("mgk-utils")) + (:file "pixel-wand" :depends-on ("drawing-wand")) + (: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 "wand-pixels" :depends-on ("wand-texture"))))

1 0

[cello-cvs] CVS cello
by fgoenninger 26 Aug '06

26 Aug '06

Update of /project/cello/cvsroot/cello In directory clnet:/tmp/cvs-serv27147 Modified Files: cello.lisp Log Message: Added: Export #:cello-window --- /project/cello/cvsroot/cello/cello.lisp 2006/08/25 08:31:57 1.10 +++ /project/cello/cvsroot/cello/cello.lisp 2006/08/26 21:44:03 1.11 @@ -14,7 +14,7 @@ |# -;;; $Id: cello.lisp,v 1.10 2006/08/25 08:31:57 fgoenninger Exp $ +;;; $Id: cello.lisp,v 1.11 2006/08/26 21:44:03 fgoenninger Exp $ ;;; ============================================================================ ;;; PACKAGE DEFINITION @@ -23,19 +23,24 @@ (defpackage :cello (:nicknames :clo) (:use - #:common-lisp - #-(or ccl cormanlisp sbcl) #:clos - #:utils-kt - #:cells - #:gui-geometry - #:cffi - #:cffi-extender - #:celtk - #:kt-opengl - #:cl-openal - #:cl-ftgl - #:cl-magick) - (:export #:cello-window-event-handler #:with-layers #:visible #:ix-togl)) + #:common-lisp + #-(or ccl cormanlisp sbcl) #:clos + #:utils-kt + #:cells + #:gui-geometry + #:cffi + #:cffi-extender + #:celtk + #:kt-opengl + #:cl-openal + #:cl-ftgl + #:cl-magick) + (:export + #:cello-window + #:cello-window-event-handler + #:with-layers + #:visible + #:ix-togl)) ;;; ============================================================================ ;;; MISC

1 0

[cello-cvs] CVS cello
by fgoenninger 26 Aug '06

26 Aug '06

Update of /project/cello/cvsroot/cello In directory clnet:/tmp/cvs-serv27087 Modified Files: cello-window.lisp Log Message: Added: export #:cello-window --- /project/cello/cvsroot/cello/cello-window.lisp 2006/08/22 16:12:34 1.4 +++ /project/cello/cvsroot/cello/cello-window.lisp 2006/08/26 21:43:36 1.5 @@ -19,7 +19,6 @@ ;------------- Window --------------- ; - (defmodel cello-window (celtk:window focuser) ( (gl-name-highest :cell nil :initarg :gl-name-highest

1 0

[cello-cvs] CVS cello/cl-ftgl/ftgl-int
by fgoenninger 26 Aug '06

26 Aug '06

Update of /project/cello/cvsroot/cello/cl-ftgl/ftgl-int In directory clnet:/tmp/cvs-serv3998 Modified Files: FTGLFromC.cpp Log Message: Changed: BuildGlyph no more part of FTGL (version 2.1.2). Tried to use MakeGlyph instead... --- /project/cello/cvsroot/cello/cl-ftgl/ftgl-int/FTGLFromC.cpp 2006/08/23 20:08:43 1.2 +++ /project/cello/cvsroot/cello/cl-ftgl/ftgl-int/FTGLFromC.cpp 2006/08/26 16:09:36 1.3 @@ -62,11 +62,12 @@ extern "C" { -/* void __stdcall fgcBuildGlyphs( FTFont* f ) + /* +void __stdcall fgcBuildGlyphs( FTFont* f ) { f->BuildGlyphs(); } -*/ + */ bool __stdcall fgcSetFaceSize( FTFont* f, unsigned int faceSize, @@ -90,13 +91,14 @@ return f->Advance( string ); } -/* + + /* int __stdcall fgcCharTexture( FTFont* f, int chr ) { - return ((FTGlyph *) f->BuildGlyph( chr ))->glRendering(); + return ((FTGlyph *) f->MakeGlyph( chr ))->glRendering(); //return f->GlyphRendering( chr ); } -*/ + */ /* void FTFont::DoRender( const unsigned int chr, const unsigned int nextChr)

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

cello-cvs