cello-cvs August 2006

cello-cvs@common-lisp.net

2 participants
51 discussions

[cello-cvs] CVS cello/cl-openal
by fgoenninger 24 Aug '06

24 Aug '06

Update of /project/cello/cvsroot/cello/cl-openal In directory clnet:/tmp/cvs-serv3606 Modified Files: cl-openal.lisp Log Message: Changed: ALUT not needed on OS X (is in OpenAL framework already). --- /project/cello/cvsroot/cello/cl-openal/cl-openal.lisp 2006/05/27 06:01:38 1.3 +++ /project/cello/cvsroot/cello/cl-openal/cl-openal.lisp 2006/08/24 07:55:07 1.4 @@ -22,6 +22,8 @@ ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ;;; IN THE SOFTWARE. +;;; $Id: cl-openal.lisp,v 1.4 2006/08/24 07:55:07 fgoenninger Exp $ + (pushnew :cl-openal *features*) (defpackage #:cl-openal @@ -45,8 +47,8 @@ (:darwin (:framework "OpenAL")) (:windows (:or "/windows/system32/openal32.dll"))) +;; OpenAL 1.0: No separate ALUT for OS X (define-foreign-library ALut - (:darwin (:framework "ALut")) (:windows (:or "/windows/system32/alut.dll"))) (defparameter *audio-files*

1 0

[cello-cvs] CVS cello/cl-openal
by fgoenninger 24 Aug '06

24 Aug '06

Update of /project/cello/cvsroot/cello/cl-openal In directory clnet:/tmp/cvs-serv3439 Modified Files: cl-openal-init.lisp Log Message: Changed: fn xoa is leading to malfunction on OS X (can't unload dylibs) --- /project/cello/cvsroot/cello/cl-openal/cl-openal-init.lisp 2006/06/03 12:06:00 1.5 +++ /project/cello/cvsroot/cello/cl-openal/cl-openal-init.lisp 2006/08/24 07:54:23 1.6 @@ -31,11 +31,12 @@ (when *openal-initialized-p* (return-from cl-openal-init t)) - (xoa) +#-macosx (xoa) (assert (use-foreign-library OpenAL) () "Failed to load OpenAL dynamic lib") - + +#-macosx (assert (use-foreign-library ALut) () "Failed to load alut dynamic lib") @@ -94,4 +95,3 @@ (progn #+shh (print (list "al-chk OK:" error$))) (break "~&Error< ~d > on ~a" status error$)))) -

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-serv7237 Modified Files: cello.lisp Log Message: Changed: Removed the loading of utils-kt. This is done in Cells already. --- /project/cello/cvsroot/cello/cello.lisp 2006/08/23 10:27:33 1.8 +++ /project/cello/cvsroot/cello/cello.lisp 2006/08/23 21:13:49 1.9 @@ -14,7 +14,7 @@ |# -;;; $Id: cello.lisp,v 1.8 2006/08/23 10:27:33 fgoenninger Exp $ +;;; $Id: cello.lisp,v 1.9 2006/08/23 21:13:49 fgoenninger Exp $ ;;; ============================================================================ ;;; PACKAGES CELLO DEPENDS ON @@ -23,13 +23,12 @@ ;;; Note: Order matters! #+asdf -(eval-when (:load-toplevel :execute) - (asdf:operate 'asdf:load-op 'utils-kt) +(eval-when (:load-toplevel :compile-toplevel :execute) (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 'gui-geometry) (asdf:operate 'asdf:load-op 'Celtk) (asdf:operate 'asdf:load-op 'cl-openal) (asdf:operate 'asdf:load-op 'cl-ftgl)

1 0

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

23 Aug '06

Update of /project/cello/cvsroot/cello/cl-magick In directory clnet:/tmp/cvs-serv6824 Modified Files: cl-magick.lisp Log Message: Added: fn set-wand-template-path, special var *wand-template*: Used to customize the path to wand template file. Changed: fn magick-wand-template: use *wand-template* if not Nil. --- /project/cello/cvsroot/cello/cl-magick/cl-magick.lisp 2006/08/23 20:17:30 1.7 +++ /project/cello/cvsroot/cello/cl-magick/cl-magick.lisp 2006/08/23 21:10:31 1.8 @@ -52,12 +52,21 @@ (in-package :cl-magick) +(defvar *wand-template* + nil + "Path to wand graphics/templates") + +(defun set-wand-template-path (wand-template-pathname) + (setf *wand-template* + wand-template-pathname)) + (defun magick-wand-template () (path-to-wand - (make-pathname - :directory '(:absolute "0dev" "user" - "graphics" "templates") - :name "metal" :type "gif"))) + (or *wand-template* + (make-pathname + :directory '(:absolute "0dev" "user" + "graphics" "templates") + :name "metal" :type "gif")))) (defparameter *imagick-dll-loaded* nil) (defparameter *wands-loaded* nil)

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-serv30981 Modified Files: ix-togl.lisp Log Message: Changed: togl-post-redisplay and togl-ptr are not exported in package Celtk. So we have to :: them. --- /project/cello/cvsroot/cello/ix-togl.lisp 2006/08/22 16:12:34 1.5 +++ /project/cello/cvsroot/cello/ix-togl.lisp 2006/08/23 20:21:59 1.6 @@ -88,7 +88,7 @@ (with-metrics (nil nil "ctk::togl-display-using-class") (when (display-continuous self) (trc nil "window-display > continuous specified so posting redisplay" self) - (ctk:togl-post-redisplay (ctk:togl-ptr self)))))) + (ctk::togl-post-redisplay (ctk::togl-ptr self))))))

1 0

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

23 Aug '06

Update of /project/cello/cvsroot/cello/cl-magick In directory clnet:/tmp/cvs-serv30632 Modified Files: wand-texture.lisp Log Message: Changed: Removed enclosing progn from file. All code was inside this progn. Why ? --- /project/cello/cvsroot/cello/cl-magick/wand-texture.lisp 2006/08/21 04:28:28 1.4 +++ /project/cello/cvsroot/cello/cl-magick/wand-texture.lisp 2006/08/23 20:20:27 1.5 @@ -22,114 +22,111 @@ (in-package :cl-magick) +(defclass wand-texture (wand-image ogl-texture)()) -(progn +(defmethod wand-release :after ((wand wand-texture)) + (when (slot-value wand 'texture-name) + (ogl-texture-delete (slot-value wand 'texture-name)))) + +(defun best-fit-cons (c1 c2 c3) + (flet ((bfit (a b c) + (if (> (/ c b)(/ b a)) + a c))) + (cons (bfit (car c1)(car c2)(car c3)) + (bfit (cdr c1)(cdr c2)(cdr c3))))) - (defclass wand-texture (wand-image ogl-texture)()) - - (defmethod wand-release :after ((wand wand-texture)) - (when (slot-value wand 'texture-name) - (ogl-texture-delete (slot-value wand 'texture-name)))) - - (defun best-fit-cons (c1 c2 c3) - (flet ((bfit (a b c) - (if (> (/ c b)(/ b a)) - a c))) - (cons (bfit (car c1)(car c2)(car c3)) - (bfit (cdr c1)(cdr c2)(cdr c3))))) - - (defmethod texture-name :around ((self wand-texture)) - (or (call-next-method) +(defmethod texture-name :around ((self wand-texture)) + (or (call-next-method) (let* ((trunc-sz (cons (expt 2 (floor (log (car (image-size self)) 2))) - (expt 2 (floor (log (cdr (image-size self)) 2))))) + (expt 2 (floor (log (cdr (image-size self)) 2))))) (grow-sz (cons (expt 2 (ceiling (log (car (image-size self)) 2))) - (expt 2 (ceiling (log (cdr (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)) + #+shh (print `(texture-name> gennning texture ,self)) (unless (equal (image-size self) best-fit-sz) #+shhh (print `(texture-name> tex-refit ,(image-size self) to ,best-fit-sz)) (magick-scale-image (mgk-wand self) (car best-fit-sz) (cdr best-fit-sz)) - ;;; gaussian-filter 0) +;;; gaussian-filter 0) (setf (image-size self) best-fit-sz)) #+shhh (print `(texture-name> new image size , self ,(image-size self))) (let ((tx (wand-image-to-texture self))) (if (plusp tx) (setf (texture-name self) tx) - (break "bad tx name ~a for ~a" tx self)))))) + (break "bad tx name ~a for ~a" tx self)))))) - (defun wand-texture-activate (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 (plusp tx)) - ;; (cells:trc "!!!!wand-image-to-texture genning new tx: ~a" tx) - (gl-bind-texture gl_texture_2d tx) +(defun wand-texture-activate (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 (plusp tx)) + ;; (cells:trc "!!!!wand-image-to-texture genning new tx: ~a" tx) + (gl-bind-texture gl_texture_2d tx) - (progn ;; useless?? - (gl-tex-parameteri gl_texture_2d gl_texture_wrap_s gl_repeat) - (gl-tex-parameteri gl_texture_2d gl_texture_wrap_t gl_repeat) ;-- + (progn ;; useless?? + (gl-tex-parameteri gl_texture_2d gl_texture_wrap_s gl_repeat) + (gl-tex-parameteri gl_texture_2d gl_texture_wrap_t gl_repeat) ;-- - (gl-tex-parameterf gl_texture_2d gl_texture_min_filter gl_linear ) - (gl-tex-parameterf gl_texture_2d gl_texture_mag_filter gl_linear )) + (gl-tex-parameterf gl_texture_2d gl_texture_min_filter gl_linear ) + (gl-tex-parameterf gl_texture_2d gl_texture_mag_filter gl_linear )) - (gl-pixel-storei gl_pack_alignment 1 ) - (gl-pixel-storei gl_unpack_alignment 1 ) + (gl-pixel-storei gl_pack_alignment 1 ) + (gl-pixel-storei gl_unpack_alignment 1 ) - (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) - (kt-opengl::glec :tex-image) - ;;(print `(wand-image-to-texture loaded texture sized ,(image-size self))) + (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) + (kt-opengl::glec :tex-image) + ;;(print `(wand-image-to-texture loaded texture sized ,(image-size self))) - (fgn-free pixels) - tx)) + (fgn-free pixels) + tx)) - (defmethod wand-render ((self wand-texture) left top right bottom - &aux (sz (image-size self))) - #+not (cells:trc nil "wand-render tex-name:" (texture-name self) (tile-p self) self - :size sz :bbox (list left top right bottom)) +(defmethod wand-render ((self wand-texture) left top right bottom + &aux (sz (image-size 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) - (wand-texture-activate self) - #+slower - (ogl-tex-gen-setup gl_object_linear gl_modulate - (if (tile-p self) gl_repeat gl_clamp) - (/ 1 (max (car sz)(cdr sz))) - :s :tee :r) + (with-attrib (gl_texture_bit) ;; gl_enable_bit gl_hint_bit gl_line_bit gl_color_buffer_bit) + (wand-texture-activate self) + #+slower + (ogl-tex-gen-setup gl_object_linear gl_modulate + (if (tile-p self) gl_repeat gl_clamp) + (/ 1 (max (car sz)(cdr sz))) + :s :tee :r) - (if (tile-p self) - (with-gl-begun (gl_quads) - (loop for y from top above bottom by (cdr sz) - for y-rem = (- bottom y) + (if (tile-p self) + (with-gl-begun (gl_quads) + (loop for y from top above bottom by (cdr sz) + for y-rem = (- bottom y) - do (loop for x from left below right by (car sz) - for x-rem = (- right x) - do ;; (print `(tex tiling ,x ,y)) + do (loop for x from left below right by (car sz) + for x-rem = (- right x) + do ;; (print `(tex tiling ,x ,y)) - (flet ((vxy (tx ty) - (let ((x-fraction (min tx (/ x-rem (car sz)))) - (y-fraction (min ty (abs (/ y-rem (cdr sz)))))) - (gl-tex-coord2f x-fraction y-fraction) - (gl-vertex3f (+ x (* x-fraction (car sz))) - (+ y (downs (* y-fraction (cdr sz)))) 0)))) - (vxy 0 0)(vxy 1 0)(vxy 1 1)(vxy 0 1))))) + (flet ((vxy (tx ty) + (let ((x-fraction (min tx (/ x-rem (car sz)))) + (y-fraction (min ty (abs (/ y-rem (cdr sz)))))) + (gl-tex-coord2f x-fraction y-fraction) + (gl-vertex3f (+ x (* x-fraction (car sz))) + (+ y (downs (* y-fraction (cdr sz)))) 0)))) + (vxy 0 0)(vxy 1 0)(vxy 1 1)(vxy 0 1))))) (flet ((vxy (tx ty) (let ((abs-x (+ left (* tx (- right left)))) (abs-y (+ top (downs (* ty (abs (- top bottom))))))) - ;(print `(tex full,(cons tx ty) to-vertex ,(cons abs-x abs-y))) + ;(print `(tex full,(cons tx ty) to-vertex ,(cons abs-x abs-y))) (gl-tex-coord2f tx ty) (gl-vertex3f abs-x abs-y 0)))) (with-gl-begun (gl_quads) (vxy 0 0)(vxy 0 1)(vxy 1 1)(vxy 1 0))) - )))) \ No newline at end of file + ))) \ No newline at end of file

1 0

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

23 Aug '06

Update of /project/cello/cvsroot/cello/cl-magick In directory clnet:/tmp/cvs-serv29468 Modified Files: cl-magick.lisp Log Message: Changed: +macosx instead of +darwin Added: libWand.dylib for OS X needed Changed: libMagick.dylib and libWand.dylib path defaults to /usr/local/lib on OS X now. --- /project/cello/cvsroot/cello/cl-magick/cl-magick.lisp 2006/08/22 16:12:35 1.6 +++ /project/cello/cvsroot/cello/cl-magick/cl-magick.lisp 2006/08/23 20:17:30 1.7 @@ -20,6 +20,12 @@ ;;; 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)) (defpackage :cl-magick (:nicknames :mgk) @@ -59,12 +65,21 @@ (defparameter *mgk-version* (fgn-alloc :unsigned-long 1)) (cffi:define-foreign-library Magick - (:darwin (:or (:framework "GraphicsMagick") "libGraphicsMagick.dylib")) + (:darwin (:or "/usr/local/lib/libMagick.dylib")) (:windows (:or #+not "C:\\Program Files\\ImageMagick-6.2.7-Q8\\CORE_RL_wand_.dll" "C:\\Program Files\\GraphicsMagick-1.1.7-Q8\\CORE_RL_wand_.dll"))) -(eval-when (load eval) - (cffi:use-foreign-library magick)) +(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)) + ;------------------------------------------------------------------- @@ -85,7 +100,8 @@ (cl-magick-init) (defun wands-loaded () *wands-loaded*) -(DEFUN (setf wands-loaded) (new-value) + +(defun (setf wands-loaded) (new-value) (setf *wands-loaded* new-value)) (defun wands-clear ()

1 0

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

23 Aug '06

Update of /project/cello/cvsroot/cello/cl-ftgl In directory clnet:/tmp/cvs-serv27734 Modified Files: cl-ftgl.lisp Log Message: Changed: CFFI definition of libFTGLint.dylib (OS X only) Changed: +macosx instead of +darwin for OS X code used. --- /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp 2006/08/21 04:28:27 1.8 +++ /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp 2006/08/23 20:11:18 1.9 @@ -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/cello/cl-ftgl/cl-ftgl.lisp,v 1.8 2006/08/21 04:28:27 ktilton Exp $ +;;; $Header: /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp,v 1.9 2006/08/23 20:11:18 fgoenninger Exp $ (defpackage #:cl-ftgl (:nicknames #:ftgl) @@ -51,7 +51,7 @@ (in-package :cl-ftgl) (define-foreign-library FTGL - (:darwin (:or (:framework "FTGL") "libftgl.dylib")) + (:darwin (:or "/opt/common-lisp/cello/cl-ftgl/ftgl-int/libFTGLint.dylib")) (:windows (:or "/0dev/user/dynlib/ftgl_dynamic_MTD_d.dll"))) (use-foreign-library FTGL) @@ -119,8 +119,10 @@ '(:absolute "windows" "fonts") #+linux '(:absolute "usr" "share" "fonts" "truetype") - #+darwin - '(:absolute "Library" "Fonts"))) + #+macosx + '(:absolute "Library" "Fonts") + )) + ;; ---------------------------------------------------------------------------- ;; FUNCTIONS/METHODS ;; ----------------------------------------------------------------------------

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-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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

cello-cvs August 2006