cello-cvs

cello-cvs@common-lisp.net

227 discussions

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

23 Aug '06

Update of /project/cello/cvsroot/cello/cl-ftgl/ftgl-int In directory clnet:/tmp/cvs-serv27566 Modified Files: FTGLFromC.cpp Log Message: Changed: Some of the functions seem to be referencing deleted functions in FTGL (2.1.2). --- /project/cello/cvsroot/cello/cl-ftgl/ftgl-int/FTGLFromC.cpp 2006/05/17 16:14:29 1.1 +++ /project/cello/cvsroot/cello/cl-ftgl/ftgl-int/FTGLFromC.cpp 2006/08/23 20:08:43 1.2 @@ -1,4 +1,3 @@ -#include <assert.h> /* ;;; ;;; Copyright © 2004 by Kenneth William Tilton. @@ -21,6 +20,15 @@ ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ;;; IN THE SOFTWARE. */ + +/* $Id */ + +/* ========================================================================== */ +/* INCLUDES */ +/* ========================================================================== */ + +#include <assert.h> + #include "FTGLBitmapFont.h" #include "FTBitmapGlyph.h" @@ -36,45 +44,60 @@ #include "FTGLPolygonFont.h" #include "FTPolyGlyph.h" -#include "FTGLOutlineFont.h" -#include "FTOutlineGlyph.h" +#include "FTGLOutlineFont.h" +#include "FTOutlineGlyph.h" -#include "FTGLExtrdFont.h" -#include "FTExtrdGlyph.h" +#include "FTGLExtrdFont.h" +#include "FTExtrdGlyph.h" +/* We only need __stdcall for Windows */ +#if !defined(WINDOWS) +#define __stdcall +#endif + +/* ========================================================================== */ +/* INTERFACE FUNCTIONS */ +/* ========================================================================== */ extern "C" { - void __stdcall fgcBuildGlyphs( FTFont* f ) - { - f->BuildGlyphs(); - } - - bool __stdcall fgcSetFaceSize( FTFont* f - , unsigned int faceSize - , unsigned int res ) - { - return f->FaceSize( faceSize, res ); - } +/* void __stdcall fgcBuildGlyphs( FTFont* f ) +{ + f->BuildGlyphs(); +} +*/ +bool __stdcall fgcSetFaceSize( FTFont* f, + unsigned int faceSize, + unsigned int res ) +{ + return f->FaceSize( faceSize, res ); +} -float __stdcall fgcAscender( FTFont* f ) { - return f->Ascender( ); +float __stdcall fgcAscender( FTFont* f ) +{ + return f->Ascender(); } -float __stdcall fgcDescender( FTFont* f ) { - return f->Descender( ); +float __stdcall fgcDescender( FTFont* f ) +{ + return f->Descender(); } -float __stdcall fgcStringAdvance( FTFont* f, const char* string ) { - return f->Advance( string ); +float __stdcall fgcStringAdvance( FTFont* f, const char* string ) +{ + return f->Advance( string ); } -int __stdcall fgcCharTexture( FTFont* f, int chr ) { - return ((FTGlyph *) f->FontGlyph( chr ))->glRendering(); - //return f->GlyphRendering( chr ); +/* +int __stdcall fgcCharTexture( FTFont* f, int chr ) +{ + return ((FTGlyph *) f->BuildGlyph( chr ))->glRendering(); + //return f->GlyphRendering( chr ); } +*/ + /* void FTFont::DoRender( const unsigned int chr, const unsigned int nextChr) { @@ -88,64 +111,72 @@ -float __stdcall fgcStringX( FTFont* f, const char* string ) { - float llx,lly,llz,urx,ury,urz; +float __stdcall fgcStringX( FTFont* f, const char* string ) +{ + float llx,lly,llz,urx,ury,urz; - f->BBox( string, llx, lly, llz, urx, ury, urz ); - return llx; + f->BBox( string, llx, lly, llz, urx, ury, urz ); + return llx; } -void __stdcall fgcRender( FTFont* f, const char *string ) { - f->Render( string ); +void __stdcall fgcRender( FTFont* f, const char *string ) +{ + f->Render( string ); } -void __stdcall fgcFree( FTFont* f ) { - delete f; +void __stdcall fgcFree( FTFont* f ) +{ + delete f; } //--------- Bitmap ---------------------------------------------- -FTGLBitmapFont* __stdcall fgcBitmapMake( const char* fontname ) { - return new FTGLBitmapFont( fontname ); +FTGLBitmapFont* __stdcall fgcBitmapMake( const char* fontname ) +{ + return new FTGLBitmapFont( fontname ); } //--------- Pixmap ---------------------------------------------- -FTGLPixmapFont* __stdcall fgcPixmapMake( const char* fontname ) { - return new FTGLPixmapFont( fontname ); +FTGLPixmapFont* __stdcall fgcPixmapMake( const char* fontname ) +{ + return new FTGLPixmapFont( fontname ); } //--------- Texture ---------------------------------------------- -FTGLTextureFont* __stdcall fgcTextureMake( const char* fontname ) { - return new FTGLTextureFont( fontname ); +FTGLTextureFont* __stdcall fgcTextureMake( const char* fontname ) +{ + return new FTGLTextureFont( fontname ); } //--------- Polygon ---------------------------------------------- -FTGLPolygonFont* __stdcall fgcPolygonMake( const char* fontname ) { - return new FTGLPolygonFont( fontname ); +FTGLPolygonFont* __stdcall fgcPolygonMake( const char* fontname ) +{ + return new FTGLPolygonFont( fontname ); } //--------- Outline ---------------------------------------------- -FTGLOutlineFont* __stdcall fgcOutlineMake( const char* fontname ) { - return new FTGLOutlineFont( fontname ); +FTGLOutlineFont* __stdcall fgcOutlineMake( const char* fontname ) +{ + return new FTGLOutlineFont( fontname ); } //--------- Extruded Polygon ------------------------------------- -FTGLExtrdFont* __stdcall fgcExtrudedMake( const char* fontname ) { - return new FTGLExtrdFont( fontname ); -} - - -bool __stdcall fgcSetFaceDepth( FTGLExtrdFont* f - , float depth ) { - f->Depth( depth ); - return true; +FTGLExtrdFont* __stdcall fgcExtrudedMake( const char* fontname ) +{ + return new FTGLExtrdFont( fontname ); } +bool __stdcall fgcSetFaceDepth( FTGLExtrdFont* f, float depth ) +{ + f->Depth( depth ); + return true; } +} // extern "C" +

1 0

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

23 Aug '06

Update of /project/cello/cvsroot/cello/cl-ftgl/ftgl-int In directory clnet:/tmp/cvs-serv27488 Modified Files: Makefile Log Message: Changed: Frameworks etc for correct dylib building added to DEPLIBS --- /project/cello/cvsroot/cello/cl-ftgl/ftgl-int/Makefile 2006/08/23 14:34:35 1.1 +++ /project/cello/cvsroot/cello/cl-ftgl/ftgl-int/Makefile 2006/08/23 20:07:32 1.2 @@ -2,7 +2,7 @@ # MAKEFILE for libFTGLinterface # ============================================================================= -# $Id: Makefile,v 1.1 2006/08/23 14:34:35 fgoenninger Exp $ +# $Id: Makefile,v 1.2 2006/08/23 20:07:32 fgoenninger Exp $ # by Frank Goenninger, Bempflingen, Germany # August 2006 @@ -17,15 +17,17 @@ INCLUDEDIRS = -I/usr/local/include/freetype2 -I/usr/local/include/freetype2/freetype -I/opt/ftgl/src/FTGL/include TARGET = libFTGLint.dylib -DEPLIBS = /opt/ftgl/src/FTGL/build/libFTGL.a +DEPLIBS = -framework Carbon -framework OpenGL -framework GLUT /usr/local/lib/libfreetype.dylib /opt/ftgl/src/FTGL/mac/build/Development/libftgl.a -CC = gcc -O +CC = g++ -O +CCFLAGS = -dynamic +LDFLAGS = -dynamiclib -flat_namespace FTGLFromC.o: $(SRCS) - $(CC) $(INCLUDEDIRS) -o FTGLFromC.o -c FTGLFromC.cpp + $(CC) $(CCFLAGS) $(INCLUDEDIRS) -o FTGLFromC.o -c FTGLFromC.cpp all: $(OBJS) - $(CC) -o $(TARGET) -undefined suppress -dynamiclib -flat_namespace $(DEPLIBS) FTGLFromC.o + $(CC) $(LDFLAGS) -o $(TARGET) $(DEPLIBS) FTGLFromC.o clean: - rm -f $(OBJS) $(TARGET) \ No newline at end of file + rm -f $(OBJS) $(TARGET)

1 0

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

23 Aug '06

Update of /project/cello/cvsroot/cello/cl-ftgl/ftgl-int In directory clnet:/tmp/cvs-serv32373 Added Files: Makefile Log Message: Makefile for libFTGLint.dylib (Mac OS X supported only) --- /project/cello/cvsroot/cello/cl-ftgl/ftgl-int/Makefile 2006/08/23 14:34:35 NONE +++ /project/cello/cvsroot/cello/cl-ftgl/ftgl-int/Makefile 2006/08/23 14:34:35 1.1 # ============================================================================= # MAKEFILE for libFTGLinterface # ============================================================================= # $Id: Makefile,v 1.1 2006/08/23 14:34:35 fgoenninger Exp $ # by Frank Goenninger, Bempflingen, Germany # August 2006 # ============================================================================= # MAKEFILE for libFTGLinterface # ============================================================================= SRCS = FTGLFromC.cpp OBJS = FTGLFromC.o INCLUDEDIRS = -I/usr/local/include/freetype2 -I/usr/local/include/freetype2/freetype -I/opt/ftgl/src/FTGL/include TARGET = libFTGLint.dylib DEPLIBS = /opt/ftgl/src/FTGL/build/libFTGL.a CC = gcc -O FTGLFromC.o: $(SRCS) $(CC) $(INCLUDEDIRS) -o FTGLFromC.o -c FTGLFromC.cpp all: $(OBJS) $(CC) -o $(TARGET) -undefined suppress -dynamiclib -flat_namespace $(DEPLIBS) FTGLFromC.o clean: rm -f $(OBJS) $(TARGET)

1 0

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

23 Aug '06

Update of /project/cello/cvsroot/cello In directory clnet:/tmp/cvs-serv23004 Modified Files: cello.lisp Log Message: Added: Id line for CVS version info in header Added: ASDF loading of packages Cello depends on Added: Some beautifying of the code (section headers) --- /project/cello/cvsroot/cello/cello.lisp 2006/07/06 22:09:10 1.7 +++ /project/cello/cvsroot/cello/cello.lisp 2006/08/23 10:27:33 1.8 @@ -14,6 +14,31 @@ |# +;;; $Id: cello.lisp,v 1.8 2006/08/23 10:27:33 fgoenninger Exp $ + +;;; ============================================================================ +;;; PACKAGES CELLO DEPENDS ON +;;; ============================================================================ + +;;; Note: Order matters! + +#+asdf +(eval-when (:load-toplevel :execute) + (asdf:operate 'asdf:load-op 'utils-kt) + (asdf:operate 'asdf:load-op 'cells) + (asdf:operate 'asdf:load-op 'gui-geometry) + (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 'Celtk) + (asdf:operate 'asdf:load-op 'cl-openal) + (asdf:operate 'asdf:load-op 'cl-ftgl) + (asdf:operate 'asdf:load-op 'cl-magick)) + +;;; ============================================================================ +;;; PACKAGE DEFINITION +;;; ============================================================================ + (defpackage :cello (:nicknames :clo) (:use @@ -22,7 +47,8 @@ #:utils-kt #:cells #:gui-geometry - #:ffx + #:cffi + #:cffi-extender #:celtk #:kt-opengl #:cl-openal @@ -30,10 +56,9 @@ #:cl-magick) (:export #:cello-window-event-handler #:with-layers #:visible #:ix-togl)) -;;; in step one we will just have Celtk playing the part of Freeglut -;;; -;;; #:celtk) -;;; (:shadowing-import-from #:celtk #:window)) +;;; ============================================================================ +;;; MISC +;;; ============================================================================ (in-package :cello)

1 0

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

22 Aug '06

Update of /project/cello/cvsroot/cello/cl-magick In directory clnet:/tmp/cvs-serv13054/cl-magick Modified Files: cl-magick.lisp wand-image.lisp Log Message: --- /project/cello/cvsroot/cello/cl-magick/cl-magick.lisp 2006/07/06 22:09:11 1.5 +++ /project/cello/cvsroot/cello/cl-magick/cl-magick.lisp 2006/08/22 16:12:35 1.6 @@ -20,6 +20,7 @@ ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ;;; IN THE SOFTWARE. + (defpackage :cl-magick (:nicknames :mgk) (:use --- /project/cello/cvsroot/cello/cl-magick/wand-image.lisp 2006/08/21 04:28:28 1.4 +++ /project/cello/cvsroot/cello/cl-magick/wand-image.lisp 2006/08/22 16:12:35 1.5 @@ -100,7 +100,7 @@ (pixels (fgn-alloc :unsigned-char (* 3 columns rows) :wand-image))) ;(print (list "wand-get-image-pixels got" wand (* 3 columns rows) pixels)) - (cells:trc "image format" wand (magick-get-image-format wand)) + (cells:trc nil "image format" wand (magick-get-image-format wand)) (magick-get-image-pixels wand first-col first-row columns rows "RGB" 0 pixels ) #+testing (progn (incf testn)

1 0

[cello-cvs] CVS cello
by ktilton 22 Aug '06

22 Aug '06

Update of /project/cello/cvsroot/cello In directory clnet:/tmp/cvs-serv13054 Modified Files: cello-window.lisp ix-togl.lisp Log Message: --- /project/cello/cvsroot/cello/cello-window.lisp 2006/08/21 04:28:26 1.3 +++ /project/cello/cvsroot/cello/cello-window.lisp 2006/08/22 16:12:34 1.4 @@ -30,7 +30,7 @@ ;;:gl-name (c-in nil) ;;:focus (c-in nil) :ll 0 :lt 0 - :lr (c-in (scr2log 1100)) + :lr (c-in (scr2log 1400)) :lb (c-in (scr2log -800)) ;; :tick-count (c-in (os-tickcount)) :event-handler 'cello-window-event-handler --- /project/cello/cvsroot/cello/ix-togl.lisp 2006/08/21 04:28:26 1.4 +++ /project/cello/cvsroot/cello/ix-togl.lisp 2006/08/22 16:12:34 1.5 @@ -59,7 +59,7 @@ :clear-rgba (list 0 0 0 1) :ll 0 :lt 0 - :lr (c-in (scr2log 1100)) + :lr (c-in (scr2log 1400)) :lb (c-in (scr2log -800)) ;;:cursor (c? (context-cursor (^mouse-control) (^keyboard-modifiers)))

1 0

[cello-cvs] CVS hello-cffi
by ktilton 21 Aug '06

21 Aug '06

Update of /project/cello/cvsroot/hello-cffi In directory clnet:/tmp/cvs-serv9908 Modified Files: arrays.lisp callbacks.lisp definers.lisp my-uffi-compat.lisp Log Message: --- /project/cello/cvsroot/hello-cffi/arrays.lisp 2006/05/17 04:29:42 1.1 +++ /project/cello/cvsroot/hello-cffi/arrays.lisp 2006/08/21 04:31:01 1.2 @@ -188,7 +188,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/hello-cffi/callbacks.lisp 2006/06/29 09:55:58 1.2 +++ /project/cello/cvsroot/hello-cffi/callbacks.lisp 2006/08/21 04:31:01 1.3 @@ -56,7 +56,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/hello-cffi/definers.lisp 2006/05/17 04:29:42 1.1 +++ /project/cello/cvsroot/hello-cffi/definers.lisp 2006/08/21 04:31:01 1.2 @@ -20,11 +20,11 @@ ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ;;; IN THE SOFTWARE. -;; $Header: /project/cello/cvsroot/hello-cffi/definers.lisp,v 1.1 2006/05/17 04:29:42 ktilton Exp $ +;; $Header: /project/cello/cvsroot/hello-cffi/definers.lisp,v 1.2 2006/08/21 04:31:01 ktilton Exp $ (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/hello-cffi/my-uffi-compat.lisp 2006/05/17 04:29:42 1.1 +++ /project/cello/cvsroot/hello-cffi/my-uffi-compat.lisp 2006/08/21 04:31:01 1.2 @@ -1,6 +1,6 @@ (in-package :cffi) -(eval-when (compile load eval) +(eval-when (:compile-toplevel :load-toplevel :execute) (export '(falloc))) (defun deref-array (array type position)

1 0

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

21 Aug '06

Update of /project/cello/cvsroot/cello/kt-opengl In directory clnet:/tmp/cvs-serv7862/kt-opengl Modified Files: gl-functions.lisp kt-opengl.lpr ogl-macros.lisp ogl-utils.lisp Log Message: CVS sucks --- /project/cello/cvsroot/cello/kt-opengl/gl-functions.lisp 2006/07/03 00:35:16 1.2 +++ /project/cello/cvsroot/cello/kt-opengl/gl-functions.lisp 2006/08/21 04:28:29 1.3 @@ -343,7 +343,7 @@ (defun-ogl :void "open-gl" "glTranslatef" (glfloat x glfloat y glfloat z )) #+diehard (DEFUN-FFX :VOID "open-gl" "glTranslatef" (GLFLOAT X GLFLOAT Y GLFLOAT Z) (PROGN (GLEC '|glTranslatef|) - (ukt:trc (or (not (zerop x))(not (zerop y))) "TRANSLATED" x y z))) + (trc (or (not (zerop x))(not (zerop y))) "TRANSLATED" x y z))) (defun-ogl :void "open-gl" "glBitmap" (glsizei width glsizei height glfloat xorig glfloat yorig glfloat xmove glfloat ymove --- /project/cello/cvsroot/cello/kt-opengl/kt-opengl.lpr 2006/07/03 00:35:16 1.3 +++ /project/cello/cvsroot/cello/kt-opengl/kt-opengl.lpr 2006/08/21 04:28:29 1.4 @@ -1,4 +1,4 @@ -;; -*- lisp-version: "8.0 [Windows] (Jun 28, 2006 10:53)"; cg: "1.81"; -*- +;; -*- lisp-version: "8.0 [Windows] (Jul 24, 2006 15:27)"; cg: "1.81"; -*- (in-package :cg-user) --- /project/cello/cvsroot/cello/kt-opengl/ogl-macros.lisp 2006/07/06 22:09:11 1.5 +++ /project/cello/cvsroot/cello/kt-opengl/ogl-macros.lisp 2006/08/21 04:28:29 1.6 @@ -48,7 +48,7 @@ (defun call-with-matrix (load-identity-p matrix-fn matrix-code) (let* ((mm-pushed (get-matrix-mode)) (sd-pushed (get-stack-depth mm-pushed))) - (ukt::wtrc (0 100 "with-matrix starts with mode" (matrix-mode-symbol mm-pushed) :depth sd-pushed) + (cells:wtrc (0 100 "with-matrix starts with mode" (matrix-mode-symbol mm-pushed) :depth sd-pushed) (gl-push-matrix) (unwind-protect (progn @@ -60,7 +60,7 @@ (assert (eql mm-pushed (get-matrix-mode))() "matrix-mode left as ~a instead of ~a by form ~a" (ogl::get-matrix-mode) mm-pushed matrix-code) - (ukt:trc "poppping matrix!!!!!" (matrix-mode-symbol (get-matrix-mode)) :from-depth (get-stack-depth (get-matrix-mode))) + (cells:trc "poppping matrix!!!!!" (matrix-mode-symbol (get-matrix-mode)) :from-depth (get-stack-depth (get-matrix-mode))) (gl-pop-matrix) (assert (eql sd-pushed (get-stack-depth mm-pushed))() "matrix depth deviated ~d during ~a" @@ -80,8 +80,7 @@ (prog1 (funcall attrib-fn) (glec :with-attrib)) - (gl-pop-attrib) - )) + (gl-pop-attrib))) (defmacro with-client-attrib ((&rest attribs) &body body) `(call-with-client-attrib @@ -95,8 +94,7 @@ (prog1 (funcall attrib-fn) (glec :with-client-attrib)) - (gl-pop-client-attrib) - )) + (gl-pop-client-attrib))) (defvar *gl-begun*) (defvar *gl-stop*) @@ -147,14 +145,14 @@ (defun glec (&optional (id :anon)) (if (and (boundp '*gl-begun*) *gl-begun*) - (progn #+shhh (ukt:trc "not checking error inside gl-begin" id)) + (progn #+shhh (cells:trc "not checking error inside gl-begin" id)) (let ((e (glgeterror))) (if (zerop e) (unless t ;; (find id '(glutcheckloop glutgetwindow)) (print `(cool ,id))) (if t ;; (null (find id '(glutInitDisplayMode glutInitWindowSize))) (if (boundp '*gl-stop*) - (ukt:trc "error but *gl-stop* already bound" e id) + (cells:trc "error but *gl-stop* already bound" e id) (progn (setf *gl-stop* t) (format t "~&~%OGL error ~a at ID ~a" e id) --- /project/cello/cvsroot/cello/kt-opengl/ogl-utils.lisp 2006/07/06 22:09:12 1.3 +++ /project/cello/cvsroot/cello/kt-opengl/ogl-utils.lisp 2006/08/21 04:28:29 1.4 @@ -49,7 +49,7 @@ (let (gl-s-plane gl-t-plane gl-r-plane gl-q-plane) (defun ogl-tex-gen-setup (mode tex-env tex-wrap scale &rest planes) - ;;(ukt::trc nil "ogl-tex-gen-setup:" mode tex-env tex-wrap scale planes) + ;;(trc nil "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 ) @@ -199,7 +199,7 @@ (ogl-pen-move (- (car ,xy)) (- (cdr ,xy))))))) (defun ogl-pen-move (x y) - ;;(ukt::trc "ogl-pen-moving" x y) + ;;(trc "ogl-pen-moving" x y) (gl-bitmap 0 0 0 0 x y (cffi-uffi-compat:make-null-pointer :void))) (defclass ogl-texture ()

1 0

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

21 Aug '06

Update of /project/cello/cvsroot/cello/cl-openal In directory clnet:/tmp/cvs-serv7862/cl-openal Modified Files: cl-openal.lpr Log Message: CVS sucks --- /project/cello/cvsroot/cello/cl-openal/cl-openal.lpr 2006/07/03 00:35:13 1.6 +++ /project/cello/cvsroot/cello/cl-openal/cl-openal.lpr 2006/08/21 04:28:28 1.7 @@ -1,4 +1,4 @@ -;; -*- lisp-version: "8.0 [Windows] (Jun 28, 2006 10:53)"; cg: "1.81"; -*- +;; -*- lisp-version: "8.0 [Windows] (Jul 24, 2006 15:27)"; cg: "1.81"; -*- (in-package :cg-user)

1 0

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

21 Aug '06

Update of /project/cello/cvsroot/cello/cl-magick In directory clnet:/tmp/cvs-serv7862/cl-magick Modified Files: cl-magick.lpr magick-wand.lisp wand-image.lisp wand-pixels.lisp wand-texture.lisp Log Message: CVS sucks --- /project/cello/cvsroot/cello/cl-magick/cl-magick.lpr 2006/07/06 22:09:11 1.5 +++ /project/cello/cvsroot/cello/cl-magick/cl-magick.lpr 2006/08/21 04:28:28 1.6 @@ -1,4 +1,4 @@ -;; -*- lisp-version: "8.0 [Windows] (Jul 5, 2006 12:21)"; cg: "1.81"; -*- +;; -*- lisp-version: "8.0 [Windows] (Jul 24, 2006 15:27)"; cg: "1.81"; -*- (in-package :cg-user) --- /project/cello/cvsroot/cello/cl-magick/magick-wand.lisp 2006/06/03 12:05:55 1.2 +++ /project/cello/cvsroot/cello/cl-magick/magick-wand.lisp 2006/08/21 04:28:28 1.3 @@ -49,7 +49,7 @@ ;;; ;;;extern WandExport char -(ffx::defun-ffx-multi (* :char) "imagick" +(ffx::defun-ffx-multi :string "imagick" "MagickDescribeImage" (:void *wand) ;;; *MagickGetConfigureInfo(:void *,const char *), ;;; *MagickGetException(const :void *,ExceptionType *), --- /project/cello/cvsroot/cello/cl-magick/wand-image.lisp 2006/07/07 14:09:15 1.3 +++ /project/cello/cvsroot/cello/cl-magick/wand-image.lisp 2006/08/21 04:28:28 1.4 @@ -100,6 +100,7 @@ (pixels (fgn-alloc :unsigned-char (* 3 columns rows) :wand-image))) ;(print (list "wand-get-image-pixels got" wand (* 3 columns rows) pixels)) + (cells:trc "image format" wand (magick-get-image-format wand)) (magick-get-image-pixels wand first-col first-row columns rows "RGB" 0 pixels ) #+testing (progn (incf testn) --- /project/cello/cvsroot/cello/cl-magick/wand-pixels.lisp 2006/07/03 00:35:13 1.2 +++ /project/cello/cvsroot/cello/cl-magick/wand-pixels.lisp 2006/08/21 04:28:28 1.3 @@ -40,12 +40,12 @@ (declare (ignorable right left)) (assert (pixels self)) - (ukt:trc nil "!!!! pixelrender entry rasterpos:" + (cells: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) + (cells:trc nil "wand-render pixels move" 0 y-move :top top :bottom bottom) (if (ogl-get-boolean gl_current_raster_position_valid) (progn @@ -66,11 +66,13 @@ (gl-disable GL_cull_face) ;(gl-scalef 1000 1000 1000) ;(gl-disable gl_scissor_test) ;; debugging try - ;(gl-enable gl_blend) ;; debugging try - (gl-blend-func gl_src_alpha gl_one_minus_src_alpha) + (gl-enable gl_blend) ;; debugging try + (gl-blend-func gl_src_alpha gl_one) + (gl-blend-func gl_dst_alpha gl_one_minus_src_alpha) + ;;(cells:trc "drew pixels " gl_src_alpha gl_zero) (gl-polygon-mode gl_front_and_back gl_fill) - #+not (trc nil "wand-pixelling" (ogl-raster-pos-get)) - (gl-pixel-storei gl_unpack_alignment 1 ) + #+not (cells:trc nil "wand-pixelling" (ogl-raster-pos-get)) + (gl-pixel-storei gl_unpack_alignment 1) (gl-draw-pixels (+ (car sz) 0) (cdr sz) gl_rgb gl_unsigned_byte (pixels self)) --- /project/cello/cvsroot/cello/cl-magick/wand-texture.lisp 2006/06/26 17:05:22 1.3 +++ /project/cello/cvsroot/cello/cl-magick/wand-texture.lisp 2006/08/21 04:28:28 1.4 @@ -72,7 +72,7 @@ (cdr (image-size self))))) ;; (assert (not *ogl-listing-p*)) (assert (plusp tx)) - ;; (trc "!!!!wand-image-to-texture genning new tx: ~a" tx) + ;; (cells: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))) - #+not (trc nil "wand-render tex-name:" (texture-name self) (tile-p self) self + #+not (cells: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

← Newer
1
...
10
11
12
13
14
15
16
...
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