[cello-cvs] CVS cello

[ktilton]

Update of /project/cello/cvsroot/cello
In directory clnet:/tmp/cvs-serv637

Modified Files:
	ix-togl.lisp nehe-06.lisp 
Log Message:


--- /project/cello/cvsroot/cello/ix-togl.lisp	2006/09/05 18:43:56	1.8
+++ /project/cello/cvsroot/cello/ix-togl.lisp	2006/09/05 23:05:36	1.9
@@ -85,7 +85,7 @@
 (defmethod ctk::togl-timer-using-class ((self ix-togl))
   (unless (or  *ogl-listing-p* ;; re-entrance happens if a DLL puts up a MessageBox
             (c-stopped))
-    (with-metrics (nil nil "ctk::togl-display-using-class")
+    (with-metrics (nil nil "ctk::ctk::togl-timer-using-class")
       (when (display-continuous self)
           (trc nil "window-display > continuous specified so posting redisplay" self)
           (ctk::togl-post-redisplay (ctk::togl-ptr self))))))
--- /project/cello/cvsroot/cello/nehe-06.lisp	2006/09/05 18:43:56	1.10
+++ /project/cello/cvsroot/cello/nehe-06.lisp	2006/09/05 23:05:36	1.11
@@ -146,7 +146,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)
@@ -176,7 +176,7 @@
   (setf *skin6* (mgk:wand-ensure-typed 'wand-texture
                   (test-image "jmcbw512" "jpg")))
   (setf *grace* (mgk:wand-ensure-typed 'wand-pixels
-                  (test-image "graceblue" "jpg")))) ; "turing" "gif"))))
+                  (test-image "grace" "jpg")))) ; "turing" "gif"))))
 
 (defun print-frame-rate (window)
   (with-slots (frame-count t0) window