Update of /project/cells/cvsroot/Celtk In directory clnet:/tmp/cvs-serv27080

Modified Files: CELTK.lpr togl.lisp Log Message:

--- /project/cells/cvsroot/Celtk/CELTK.lpr 2006/08/21 04:30:22 1.19 +++ /project/cells/cvsroot/Celtk/CELTK.lpr 2006/08/28 21:44:40 1.20 @@ -1,4 +1,4 @@ -;; -*- lisp-version: "8.0 [Windows] (Aug 17, 2006 12:24)"; cg: "1.81"; -*- +;; -*- lisp-version: "8.0 [Windows] (Aug 24, 2006 21:48)"; cg: "1.81"; -*-

(in-package :cg-user)

--- /project/cells/cvsroot/Celtk/togl.lisp 2006/08/21 04:30:23 1.17 +++ /project/cells/cvsroot/Celtk/togl.lisp 2006/08/28 21:44:40 1.18 @@ -157,6 +157,7 @@ (,height-var (togl-height ,togl-ptr))) ,@body))

+ (defmacro def-togl-callback (root (&optional (ptr-var 'togl-ptr)(self-var 'self)) &body preamble) (let ((register$ (format nil "TOGL-~a-FUNC" root)) (cb$ (format nil "TOGL-~a" root)) @@ -183,9 +184,9 @@ (defmethod ,(intern uc$) ((self togl))))))

(def-togl-callback create () - (trc nil "!!!!!!!!!!!!!!!!!! about to install togl-ptr!!!!!!!!!!!!!!!!!!" togl-ptr self) - (setf cl-ftgl::*ftgl-ogl* togl-ptr) ;; help debug failure to use lazy cells/classes to defer FTGL till Ogl ready - + (trc "!!!!!!!!!!!!!!!!!! about to install togl-ptr!!!!!!!!!!!!!!!!!!" togl-ptr ) + #+cl-ftgl (setf cl-ftgl::*ftgl-ogl* togl-ptr) ;; help debug failure to use lazy cells/classes to defer FTGL till Ogl ready + (ogl::kt-opengl-reset) (setf (togl-ptr self) togl-ptr) (setf (gethash (pointer-address togl-ptr) (tkwins *tkw*)) self))