Update of /project/cello/cvsroot/cello/cl-ftgl In directory clnet:/tmp/cvs-serv27598/cl-ftgl

Modified Files: cl-ftgl.lisp Log Message:

--- /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp 2006/09/17 22:39:20 1.14 +++ /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp 2006/10/02 02:59:18 1.15 @@ -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.14 2006/09/17 22:39:20 fgoenninger Exp $ +;;; $Header: /project/cello/cvsroot/cello/cl-ftgl/cl-ftgl.lisp,v 1.15 2006/10/02 02:59:18 ktilton Exp $

(eval-when (:compile-toplevel :load-toplevel) (pushnew :cl-ftgl *features*)) @@ -189,11 +189,6 @@ `(progn #+nahhh (unless (boundp '*gl-begun*) (assert (zerop (glgeterror)))) - #+nahhh (loop for (key . fonts) in (mathx::mp-fonts mathx::*font-node*) - when (eq key 'mathx::mathvar) - do (loop for font across fonts - when (or (eql 12 (ftgl-size font))(ftgl-ifont font)) - do (cells::trc nil "dbgftgl sees ifont" ,tag (ftgl-face font)(ftgl-size font)(ftgl-ifont font)))) (progn ;; cells:wtrc (0 100 "dbgftgl" ,tag) (ftgl-assert-opengl-context) (unless (boundp '*gl-begun*) (glec :dbgftgl-entry)) @@ -259,12 +254,6 @@

(defun dbgfont (font calltag) (declare (ignore font calltag)) -;;; (cells::trc "dbgfont" calltag (ftgl-dbg font) (ftgl-face font)(ftgl-size font)(ftgl-ifont font)) -;;; (unless (find font mathx::*font-node-all*) -;;; (cells::trc "dbgfont unknown!!!!! " calltag ) -;;; (dolist (f mathx::*font-node-all*) -;;; (cells::trc "known" (ftgl-dbg f)(ftgl-face f)(ftgl-size f))) -;;; (break "odd font")) )

(defun ftgl-assert-opengl-context () @@ -408,7 +397,7 @@ (fgc-bitmap-make fpath))

(defmethod fgc-font-make ((font ftgl-texture) fpath) - ;;(format t "~%*** FGC-FONT-MAKE: fpath = ~A~%" fpath) + (format t "~%*** FGC-FONT-MAKE: fpath = ~A~%" fpath) (fgc-texture-make fpath))

(defmethod fgc-font-make ((font ftgl-extruded) fpath) @@ -423,7 +412,8 @@ (fgc-polygon-make fpath))

(defun ftgl-string-length (font cs) - (fgc-string-advance (ftgl-get-metrics-font font) cs)) + (dbgftgl :ftgl-string-length + (fgc-string-advance (ftgl-get-metrics-font font) cs)))

(defmethod font-bearing-x (font &optional text) (declare (ignorable font text))