cello-cvs

cello-cvs@common-lisp.net

227 discussions

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

21 Aug '06

Update of /project/cello/cvsroot/cello/cl-ftgl In directory clnet:/tmp/cvs-serv7862/cl-ftgl Modified Files: cl-ftgl.lisp cl-ftgl.lpr Log Message: CVS sucks --- /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp 2006/07/08 03:29:09 1.7 +++ /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp 2006/08/21 04:28:27 1.8 @@ -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.7 2006/07/08 03:29:09 ktilton Exp $ +;;; $Header: /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp,v 1.8 2006/08/21 04:28:27 ktilton Exp $ (defpackage #:cl-ftgl (:nicknames #:ftgl) @@ -178,7 +178,8 @@ ifont) (defun ftgl-assert-opengl-context () - ;; use when debugging FTGL being hit before opengl context estanblished (assert *ftgl-ogl*) + ;; use when debugging FTGL being hit before opengl context estanblished + (assert *ftgl-ogl*) ) (defun ftgl-char-width (f c) @@ -253,10 +254,10 @@ (typecase font (ftgl-extruded #+nyet (let ((*ogl-listing-p* t)) - (ukt::trc nil "ftgl-get-display-font> building glyphs for" font) + (trc nil "ftgl-get-display-font> building glyphs for" font) (fgc-build-glyphs cf) - (ukt::trc nil "ftgl-get-display-font> glyphs built OK for" font))) + (trc nil "ftgl-get-display-font> glyphs built OK for" font))) (ftgl-texture #+no (fgc-set-face-size cf (ftgl-size font) (ftgl-target-res font))) (ftgl-pixmap --- /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lpr 2006/07/03 00:35:12 1.6 +++ /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lpr 2006/08/21 04:28:27 1.7 @@ -1,4 +1,4 @@ -;; -*- lisp-version: "8.0 [Windows] (Jun 28, 2006 10:53)"; cg: "1.81"; -*- +;; -*- lisp-version: "8.0 [Windows] (Aug 17, 2006 12:24)"; cg: "1.81"; -*- (in-package :cg-user)

1 0

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

21 Aug '06

Update of /project/cello/cvsroot/cello/cffi-extender In directory clnet:/tmp/cvs-serv7862/cffi-extender Modified Files: cffi-extender.lpr Log Message: CVS sucks --- /project/cello/cvsroot/cello/cffi-extender/cffi-extender.lpr 2006/07/03 00:35:12 1.3 +++ /project/cello/cvsroot/cello/cffi-extender/cffi-extender.lpr 2006/08/21 04:28:27 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)

1 0

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

21 Aug '06

Update of /project/cello/cvsroot/cello In directory clnet:/tmp/cvs-serv7862 Modified Files: cello-window.lisp cello.lpr image.lisp ix-opengl.lisp ix-paint.lisp ix-togl.lisp window-utilities.lisp Log Message: CVS sucks --- /project/cello/cvsroot/cello/cello-window.lisp 2006/07/03 00:35:12 1.2 +++ /project/cello/cvsroot/cello/cello-window.lisp 2006/08/21 04:28:26 1.3 @@ -20,31 +20,8 @@ ; -(defmodel cello-window (celtk:window focuser) ;; control ogl-shared-resource-tender) +(defmodel cello-window (celtk:window focuser) ( -;;; (mouse-pos :initarg :mouse-pos :initform (c-in nil) :accessor mouse-pos) ;logical coords. Try to maintain for now. -;;; -;;; (mouse-view :initarg :mouse-view :accessor mouse-view -;;; :initform (c? (let ((mp (^mouse-pos))) -;;; (trc nil "mouseview sees pos" .w. mp) -;;; (when mp -;;; (eko (nil "mouseview >" self) -;;; (without-c-dependency -;;; (find-ix-under self mp))))))) -;;; -;;; (mouse-control :initarg :mouse-control :accessor mouse-control -;;; :initform (c? (bwhen (node (^mouse-view)) -;;; (eko (nil "possible mousecontrol" node) -;;; (fm-ascendant-if node #'fully-enabled))))) -;;; -;;; (mouse-cursor :initarg :mouse-cursor :initform nil :accessor mouse-cursor) -;;; -;;; (mouse-up-evt :cell :ephemeral :initarg :mouse-up-evt :initform (c-in nil) :accessor mouse-up-evt) -;;; (mouse-down-evt :cell :ephemeral :initarg :mouse-down-evt :initform (c-in nil) :accessor mouse-down-evt) -;;; (double-click? :initform (c-in nil) :accessor double-click?) -;;; -;;; (tick-count :initarg :tick-count :initform (c-in nil) :accessor tick-count) -;;; (tick-fine :initarg :tick-fine :initform (c-in nil) :accessor tick-fine) (gl-name-highest :cell nil :initarg :gl-name-highest :initform 0 :accessor gl-name-highest)) @@ -62,6 +39,10 @@ (defmethod path ((self cello-window)) ".") (defmethod parent-path ((self cello-window)) "") +(defmethod g-offset ((self cello-window) &optional (accum-h 0) (accum-v 0)) + (declare (ignorable self)) + (mkv2 accum-h accum-v)) + (defmethod cello-window-event-handler (self xe) (declare (ignorable self)) (TRC nil "cello-window-event-handler" self (ctk::tk-event-type (ctk::xsv type xe)) ) @@ -76,7 +57,7 @@ (:KeyRelease ) (:ButtonPress ) (:ButtonRelease ) - (:MotionNotify ) + (:MotionNotify (trc "we got motion!!!!")) (:EnterNotify ) (:LeaveNotify ) (:FocusIn ) --- /project/cello/cvsroot/cello/cello.lpr 2006/07/24 05:00:35 1.10 +++ /project/cello/cvsroot/cello/cello.lpr 2006/08/21 04:28:26 1.11 @@ -1,4 +1,4 @@ -;; -*- lisp-version: "8.0 [Windows] (Jul 11, 2006 4:27)"; cg: "1.81"; -*- +;; -*- lisp-version: "8.0 [Windows] (Aug 17, 2006 12:24)"; cg: "1.81"; -*- (in-package :cg-user) --- /project/cello/cvsroot/cello/image.lisp 2006/07/06 22:09:10 1.9 +++ /project/cello/cvsroot/cello/image.lisp 2006/08/21 04:28:26 1.10 @@ -17,7 +17,7 @@ (in-package :cello) (eval-when (compile load eval) - (export '(ix-view ix-stack ix-row ix-stack-lazy ix-row-lazy a-stack a-row a-stack-lazy a-row-lazy))) + (export '(ix-view ix-stack ix-row ix-stack-lazy ix-row-lazy a-stack a-row a-stack-lazy a-row-lazy ^visible))) ; ------------------------------------------------------ (defmodel ogl-quadric-based (ogl-node) --- /project/cello/cvsroot/cello/ix-opengl.lisp 2006/07/06 22:09:10 1.3 +++ /project/cello/cvsroot/cello/ix-opengl.lisp 2006/08/21 04:28:26 1.4 @@ -44,10 +44,14 @@ (defmethod ogl-node-window (other) (c-break "ogl-node-window undefined for ~a" other)) +(export! .og. .ogc.) + (define-symbol-macro .og. (or (ogl-context self) (setf (ogl-context self) (upper self ctk::togl)))) +(define-symbol-macro .ogc. (togl-ptr .og.)) + (defmodel ogl-node () ((ogl-context :cell nil :initform nil :accessor ogl-context) (dsp-list :initarg :dsp-list :accessor dsp-list --- /project/cello/cvsroot/cello/ix-paint.lisp 2006/07/03 00:35:12 1.2 +++ /project/cello/cvsroot/cello/ix-paint.lisp 2006/08/21 04:28:26 1.3 @@ -17,22 +17,31 @@ (in-package :cello) (defmethod ix-paint :after ((self family)) - (dolist (k (kids self)) - (trc nil "ixr geo" k (list (px k)(py k)) (list (ll k)(lt k)(lr k)(lb k))) - (trc nil "render kid pxy" k (px k)(py k) - :rpos-before (ogl-get-boolean gl_current_raster_position_valid) - (ogl-raster-pos-get)) - (c-assert (px k) () "pX is null in ~a" k) - (c-assert (py k) () "pY is null in ~a" k) + (let ((kids (kids self))) + (declare (ignorable kids)) + (block chk1 + (dolist (k kids) + (unless (find k (kids self)) + (trc "1. kid ~a amongst ~a, no longer amongst kids ~a" k kids (kids self)) + (break "1. kid ~a amongst ~a, no longer amongst kids ~a" k kids (kids self)) + (return-from chk1)))) + (dolist (k (kids self)) + (trc nil "ixr geo" k (list (px k)(py k)) (list (ll k)(lt k)(lr k)(lb k))) + (trc nil "render kid pxy" k (px k)(py k) + :rpos-before (ogl-get-boolean gl_current_raster_position_valid) + (ogl-raster-pos-get)) + (assert (find k (kids self))() "kid ~a no longer amongst kids ~a" k (kids self)) + (c-assert (px k) () "pX is null in ~a" k) + (c-assert (py k) () "pY is null in ~a" k) - (if (dsp-list k) - (progn - (count-it :call-list) - (trc "ix-paint calling list" (dsp-list k)) - (gl-call-list (dsp-list k))) ; 06/0629 edit caret presences causes INVALID_OP on + (if (dsp-list k) + (progn + (count-it :call-list) + (trc "ix-paint calling list" (dsp-list k)) + (gl-call-list (dsp-list k))) ; 06/0629 edit caret presences causes INVALID_OP on ; first run only in a session; just continue from - (ix-paint k)))) + (ix-paint k))))) (defun rpchk (id pfail psucc &optional self) (declare (ignorable pfail)) --- /project/cello/cvsroot/cello/ix-togl.lisp 2006/07/06 22:09:10 1.3 +++ /project/cello/cvsroot/cello/ix-togl.lisp 2006/08/21 04:28:26 1.4 @@ -22,6 +22,8 @@ ;------------- Window --------------- ; +(export! mouse-view ^mouse-view mouse-pos ^mouse-pos mouse-control ^mouse-control) + (defmodel ix-togl ( #+not focuser ogl-lit-scene control ogl-shared-resource-tender togl ix-view) ( (redisplayp :cell nil :initarg :redisplayp :initform nil :accessor redisplayp) @@ -67,6 +69,9 @@ :event-handler 'ix-togl-event-handler )) +(export! .togl) +(define-symbol-macro .togl (nearest self ix-togl)) + (defmethod ctk::togl-display-using-class ((self ix-togl)) (unless (or *ogl-listing-p* ;; re-entrance happens if a DLL puts up a MessageBox (c-stopped)) @@ -95,14 +100,16 @@ (:KeyPress ) (:KeyRelease ) (:ButtonPress - (setf (mouse-pos self) (mkv2 (ctk::xbe-x xe)(ctk::xbe-y xe))) ; trigger mouseview recalc + (setf (mouse-pos self) (mkv2 (ctk::xbe-x xe) + (- (ctk::xbe-y xe)))) ; trigger mouseview recalc (setf (mouse-down-evt self) (make-os-event :modifiers (keyboard-modifiers .tkw) :where (mkv2 (ctk::xbe-x xe)(ctk::xbe-y xe)) :realtime (now)))) (:ButtonRelease ) (:MotionNotify - (setf (mouse-pos self) (mkv2 (ctk::xbe-x xe)(ctk::xbe-y xe)))) + (setf (mouse-pos self) (mkv2 (ctk::xbe-x xe) + (- (ctk::xbe-y xe))))) (:EnterNotify ) (:LeaveNotify ) (:FocusIn ) @@ -223,7 +230,7 @@ (defparameter *mgw-far* -1500) (defmethod ctk:togl-create-using-class ((self ix-togl)) - (setf (gl-name self) (car (gl-gen-lists 1))) + (setf (gl-name self) (gl-gen-lists 1)) (cello-gl-init) ;; clear errors ;;; ;;; #+profile (macrolet ((glm (param num) --- /project/cello/cvsroot/cello/window-utilities.lisp 2006/06/26 17:05:20 1.6 +++ /project/cello/cvsroot/cello/window-utilities.lisp 2006/08/21 04:28:26 1.7 @@ -101,12 +101,13 @@ (defun find-ix-under (self os-pos &key (test #'true)) (when (and (visible self) (not (collapsed self))) + (trc nil "find-ix-under" self os-pos (screen-box self)) (let ((inself (point-in-box os-pos (screen-box self)))) (or (when (or inself (not (clipped self))) (trc nil "inside self sbox" self os-pos (screen-box self)) (dolistreversed (k (kids self)) ;; overlap goes to last kid displayed (unless (typep k 'window) - (trc nil "fixunder kid" k) + (trc nil "fixunder kid!!!!!!!!" k) (bwhen (ix (find-ix-under k os-pos :test test)) (return-from find-ix-under ix)))))

1 0

[cello-cvs] CVS cello
by ktilton 24 Jul '06

24 Jul '06

Update of /project/cello/cvsroot/cello In directory clnet:/tmp/cvs-serv25558 Modified Files: cello.lpr colors.lisp ix-layer-expand.lisp nehe-06.lisp Log Message: --- /project/cello/cvsroot/cello/cello.lpr 2006/07/06 22:09:10 1.9 +++ /project/cello/cvsroot/cello/cello.lpr 2006/07/24 05:00:35 1.10 @@ -1,4 +1,4 @@ -;; -*- lisp-version: "8.0 [Windows] (Jul 5, 2006 12:21)"; cg: "1.81"; -*- +;; -*- lisp-version: "8.0 [Windows] (Jul 11, 2006 4:27)"; cg: "1.81"; -*- (in-package :cg-user) --- /project/cello/cvsroot/cello/colors.lisp 2006/07/06 22:09:10 1.4 +++ /project/cello/cvsroot/cello/colors.lisp 2006/07/24 05:00:35 1.5 @@ -71,7 +71,7 @@ (cffi:mem-aref co :float 3))) (eval-when (:compile-toplevel :load-toplevel :execute) - (export '(+white+ +red+ +dark-green+ +green+ +turqoise+ +dk-blue+ + (export '(+white+ +red+ +dark-green+ +green+ +turquoise+ +dk-blue+ +blue+ +lt-blue+ +black+ +yellow+ +lt-yellow+ +purple+ +gray+ +lt-gray+ +dk-gray+))) @@ -79,7 +79,7 @@ (defparameter +red+ (mk-rgba 255 0 0 255)) (defparameter +dark-green+ (mk-rgba 0 128 0 255)) (defparameter +green+ (mk-rgba 0 255 0 255)) -(defparameter +turqoise+ (mk-rgba 0 255 255 255)) +(defparameter +turquoise+ (mk-rgba 0 255 255 255)) (defparameter +dk-blue+ (mk-rgba 0 0 64 50)) (defparameter +blue+ (mk-rgba 0 0 255 255)) (defparameter +lt-blue+ (mk-rgba 127 127 255 255)) --- /project/cello/cvsroot/cello/ix-layer-expand.lisp 2006/07/06 22:09:10 1.6 +++ /project/cello/cvsroot/cello/ix-layer-expand.lisp 2006/07/24 05:00:35 1.7 @@ -34,7 +34,7 @@ (def-layer-expansion +red+) (def-layer-expansion +dark-green+) (def-layer-expansion +green+) -(def-layer-expansion +turqoise+) +(def-layer-expansion +turquoise+) (def-layer-expansion +dk-blue+) (def-layer-expansion +blue+) (def-layer-expansion +lt-blue+) --- /project/cello/cvsroot/cello/nehe-06.lisp 2006/07/06 22:09:10 1.7 +++ /project/cello/cvsroot/cello/nehe-06.lisp 2006/07/24 05:00:35 1.8 @@ -143,7 +143,7 @@ (gl-tex-coord2f 0 1) (v3f -1 1 -1) )) ;;#+ifuwanttoseepixmap - (wand-render *grace* 0 0 1 -1) + ;;(wand-render *grace* 0 0 1 -1) (progn (gl-scalef 0.006 0.006 0.0)

1 0

[cello-cvs] CVS cello/cl-ftgl
by ktilton 08 Jul '06

08 Jul '06

Update of /project/cello/cvsroot/cello/cl-ftgl In directory clnet:/tmp/cvs-serv5453/cl-ftgl Modified Files: cl-ftgl.lisp Log Message: Initialize array element to nil, critical to algorithm --- /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp 2006/07/06 22:09:11 1.6 +++ /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp 2006/07/08 03:29:09 1.7 @@ -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.6 2006/07/06 22:09:11 ktilton Exp $ +;;; $Header: /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp,v 1.7 2006/07/08 03:29:09 ktilton Exp $ (defpackage #:cl-ftgl (:nicknames #:ftgl) @@ -173,7 +173,7 @@ (defstruct ftgl face size target-res depth descender ascender - (widths (make-array 256)) + (widths (make-array 256 :initial-element nil)) ft-metrics ifont)

1 0

[cello-cvs] CVS cello/cl-magick
by ktilton 07 Jul '06

07 Jul '06

Update of /project/cello/cvsroot/cello/cl-magick In directory clnet:/tmp/cvs-serv22894/cl-magick Modified Files: wand-image.lisp Log Message: --- /project/cello/cvsroot/cello/cl-magick/wand-image.lisp 2006/07/06 22:09:11 1.2 +++ /project/cello/cvsroot/cello/cl-magick/wand-image.lisp 2006/07/07 14:09:15 1.3 @@ -98,7 +98,6 @@ (let* ((columns (- last-col first-col)) (rows (- last-row first-row)) (pixels (fgn-alloc :unsigned-char (* 3 columns rows) :wand-image))) - (ukt:trc "wand pixels has colrowa" columns rows) ;(print (list "wand-get-image-pixels got" wand (* 3 columns rows) pixels)) (magick-get-image-pixels wand first-col first-row columns rows "RGB" 0 pixels ) @@ -108,7 +107,7 @@ (print `(writeimage ,(magick-write-image wand (format nil "C:\\TEST~a.GIF" testn)))) #+not (print `(writeimage ,(magick-write-image wand "C:\\TEST.BMP")))) - (loop for row below 16 do + #+jesfoolinaround(loop for row below 16 do (loop for col below 16 by 1 for offset = (+ (* row columns 3) (* col 3)) do (print (loop for bn below 3

1 0

[cello-cvs] CVS cello/cl-ftgl
by ktilton 07 Jul '06

07 Jul '06

Update of /project/cello/cvsroot/cello/cl-ftgl In directory clnet:/tmp/cvs-serv3104/cl-ftgl Added Files: cl-ftgl.asd Log Message: --- /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.asd 2006/07/07 01:14:21 NONE +++ /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.asd 2006/07/07 01:14:21 1.1 (asdf:defsystem :cl-ftgl :depends-on (:cffi :kt-opengl :cells) :serial t :components ((:file "cl-ftgl")))

1 0

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

06 Jul '06

Update of /project/cello/cvsroot/cello/kt-opengl In directory clnet:/tmp/cvs-serv9972/kt-opengl Modified Files: kt-opengl.asd ogl-macros.lisp ogl-utils.lisp Log Message: --- /project/cello/cvsroot/cello/kt-opengl/kt-opengl.asd 2006/05/27 06:01:38 1.1 +++ /project/cello/cvsroot/cello/kt-opengl/kt-opengl.asd 2006/07/06 22:09:11 1.2 @@ -13,7 +13,7 @@ :licence "MIT" :description "Partial OpenGL Bindings" :long-description "Poorly implemented bindings to half of OpenGL" - :depends-on (:cffi-extender) + :depends-on (:cffi-extender :cells) :serial t :components ((:file "kt-opengl") (:file "gl-def") --- /project/cello/cvsroot/cello/kt-opengl/ogl-macros.lisp 2006/07/03 00:35:16 1.4 +++ /project/cello/cvsroot/cello/kt-opengl/ogl-macros.lisp 2006/07/06 22:09:11 1.5 @@ -24,7 +24,7 @@ (in-package :kt-opengl) -(eval-when (compile load eval) +(eval-when (:compile-toplevel :load-toplevel :execute) (export '(with-gl-translation))) (defvar *stack-depth* @@ -44,19 +44,6 @@ (funcall matrix-fn)) (gl-pop-matrix))) -(defun get-stack-depth (mm) - (gl-get-integerv - (ecase (matrix-mode-symbol mm) - (gl_modelview gl_modelview_stack_depth) - (gl_projection gl_projection_stack_depth) - (gl_texture gl_texture_stack_depth)) - *stack-depth*) - (aforef *stack-depth* 0)) - -(defun get-matrix-mode () - (gl-get-integerv gl_matrix_mode *ogl-int*) - (eltgli *ogl-int* 0)) - #+debugversion (defun call-with-matrix (load-identity-p matrix-fn matrix-code) (let* ((mm-pushed (get-matrix-mode)) --- /project/cello/cvsroot/cello/kt-opengl/ogl-utils.lisp 2006/06/05 01:47:50 1.2 +++ /project/cello/cvsroot/cello/kt-opengl/ogl-utils.lisp 2006/07/06 22:09:12 1.3 @@ -177,6 +177,19 @@ (defun ogl-raster-pos-get () (gl-get-ints-4 gl_current_raster_position)) +(defun get-stack-depth (mm) + (gl-get-integerv + (ecase (matrix-mode-symbol mm) + (gl_modelview gl_modelview_stack_depth) + (gl_projection gl_projection_stack_depth) + (gl_texture gl_texture_stack_depth)) + *stack-depth*) + (aforef *stack-depth* 0)) + +(defun get-matrix-mode () + (gl-get-integerv gl_matrix_mode *ogl-int*) + (eltgli *ogl-int* 0)) + (defmacro with-bitmap-shifted ((x y) &body body) (let ((xy (gensym))) `(let ((,xy (cons ,x ,y)))

1 0

[cello-cvs] CVS cello/cl-ftgl
by ktilton 06 Jul '06

06 Jul '06

Update of /project/cello/cvsroot/cello/cl-ftgl In directory clnet:/tmp/cvs-serv9972/cl-ftgl Modified Files: cl-ftgl.lisp Log Message: --- /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp 2006/07/03 00:35:12 1.5 +++ /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp 2006/07/06 22:09:11 1.6 @@ -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.5 2006/07/03 00:35:12 ktilton Exp $ +;;; $Header: /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp,v 1.6 2006/07/06 22:09:11 ktilton Exp $ (defpackage #:cl-ftgl (:nicknames #:ftgl) @@ -51,7 +51,7 @@ (in-package :cl-ftgl) (define-foreign-library FTGL - (:darwin (:framework "FTGL")) + (:darwin (:or (:framework "FTGL") "libftgl.dylib")) (:windows (:or "/0dev/user/dynlib/ftgl_dynamic_MTD_d.dll"))) (use-foreign-library FTGL) @@ -177,8 +177,12 @@ ft-metrics ifont) +(defun ftgl-assert-opengl-context () + ;; use when debugging FTGL being hit before opengl context estanblished (assert *ftgl-ogl*) + ) + (defun ftgl-char-width (f c) - (assert *ftgl-ogl*) + (ftgl-assert-opengl-context) (or (aref (ftgl-widths f) (char-code c)) (setf (aref (ftgl-widths f) (char-code c)) (ftgl-string-length f (string c))))) @@ -220,19 +224,19 @@ (xftgl) (defun ftgl-get-ascender (font) - (assert *ftgl-ogl*) + (ftgl-assert-opengl-context) (or (ftgl-ascender font) (setf (ftgl-ascender font) (fgc-ascender (ftgl-get-metrics-font font))))) (defun ftgl-get-descender (font) - (assert *ftgl-ogl*) + (ftgl-assert-opengl-context) (or (ftgl-descender font) (setf (ftgl-descender font) (fgc-descender (ftgl-get-metrics-font font))))) (defun ftgl-height (f) - (assert *ftgl-ogl*) + (ftgl-assert-opengl-context) (- (ftgl-get-ascender f) (ftgl-get-descender f)))

1 0

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

06 Jul '06

Update of /project/cello/cvsroot/cello/cl-openal In directory clnet:/tmp/cvs-serv9972/cl-openal Modified Files: cl-openal.asd Log Message: --- /project/cello/cvsroot/cello/cl-openal/cl-openal.asd 2006/05/17 16:14:29 1.1 +++ /project/cello/cvsroot/cello/cl-openal/cl-openal.asd 2006/07/06 22:09:11 1.2 @@ -16,6 +16,7 @@ :licence "MIT" :description "Partial OpenAL Bindings" :long-description "Poorly implemented bindings to half of OpenAL" + :depends-on (cffi cffi-extender) :perform (load-op :after (op cl-openal) (pushnew :cl-openal cl:*features*)) :components ((:file "cl-openal") @@ -28,4 +29,4 @@ (:file "cl-openal-init" :depends-on ("alut")) (:file "wav-handling" :depends-on ("cl-openal-init")) - (:file "cl-openal-demo" :depends-on ("wav-handling")))) \ No newline at end of file + (:file "cl-openal-demo" :depends-on ("wav-handling"))))

1 0

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