[cells-cvs] CVS update: cell-cultures/cl-ftgl/cl-ftgl.lisp

Kenny Tilton ktilton at common-lisp.net
Fri Oct 1 04:01:20 UTC 2004


Update of /project/cells/cvsroot/cell-cultures/cl-ftgl
In directory common-lisp.net:/tmp/cvs-serv2293/cl-ftgl

Modified Files:
	cl-ftgl.lisp 
Log Message:
A couple of simple fixes to get the pixel and texture wands (GraphicksMagic stuff) working again and now Cello is pretty much back in business.
Date: Fri Oct  1 06:01:13 2004
Author: ktilton

Index: cell-cultures/cl-ftgl/cl-ftgl.lisp
diff -u cell-cultures/cl-ftgl/cl-ftgl.lisp:1.3 cell-cultures/cl-ftgl/cl-ftgl.lisp:1.4
--- cell-cultures/cl-ftgl/cl-ftgl.lisp:1.3	Wed Sep 29 04:50:43 2004
+++ cell-cultures/cl-ftgl/cl-ftgl.lisp	Fri Oct  1 06:01:12 2004
@@ -20,7 +20,7 @@
 ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 
 ;;; IN THE SOFTWARE.
 
-;;; $Header: /project/cells/cvsroot/cell-cultures/cl-ftgl/cl-ftgl.lisp,v 1.3 2004/09/29 02:50:43 ktilton Exp $
+;;; $Header: /project/cells/cvsroot/cell-cultures/cl-ftgl/cl-ftgl.lisp,v 1.4 2004/10/01 04:01:12 ktilton Exp $
 
 (defpackage #:cl-ftgl
   (:nicknames #:ftgl)
@@ -461,7 +461,7 @@
     (setf (ftgl-ifont font) (ftgl-font-make font))))
 
 (defun ftgl-font-make (font)
-  (print (list "ftgl-font-make entry" font))
+  ;;(print (list "ftgl-font-make entry" font))
   (let ((path (merge-pathnames
                (make-pathname :name (string (ftgl-face font)) :type "ttf")
                *font-directory-path*)))
@@ -478,13 +478,6 @@
 
 (defun ftgl-render (font s)
   (let ((df (ftgl-get-display-font font)))
-    (when (typep font 'ftgl-texture)
-      (assert cello::*w*)
-      (ukt::trc "ftgl-render sees texture,font"
-        (fgc-char-texture df (char-code #\a)) font
-        (gl-is-texture (fgc-char-texture df (char-code #\a)))
-        (gl-is-enabled gl_texture_2d)))
-     
     (uffi:with-cstring (cs s)
       (fgc-render df cs))))
 





More information about the Cells-cvs mailing list