Update of /project/cello/cvsroot/cello/kt-opengl In directory clnet:/tmp/cvs-serv7862/kt-opengl

Modified Files: gl-functions.lisp kt-opengl.lpr ogl-macros.lisp ogl-utils.lisp Log Message: CVS sucks

--- /project/cello/cvsroot/cello/kt-opengl/gl-functions.lisp 2006/07/03 00:35:16 1.2 +++ /project/cello/cvsroot/cello/kt-opengl/gl-functions.lisp 2006/08/21 04:28:29 1.3 @@ -343,7 +343,7 @@ (defun-ogl :void "open-gl" "glTranslatef" (glfloat x glfloat y glfloat z )) #+diehard (DEFUN-FFX :VOID "open-gl" "glTranslatef" (GLFLOAT X GLFLOAT Y GLFLOAT Z) (PROGN (GLEC '|glTranslatef|) - (ukt:trc (or (not (zerop x))(not (zerop y))) "TRANSLATED" x y z))) + (trc (or (not (zerop x))(not (zerop y))) "TRANSLATED" x y z))) (defun-ogl :void "open-gl" "glBitmap" (glsizei width glsizei height glfloat xorig glfloat yorig glfloat xmove glfloat ymove --- /project/cello/cvsroot/cello/kt-opengl/kt-opengl.lpr 2006/07/03 00:35:16 1.3 +++ /project/cello/cvsroot/cello/kt-opengl/kt-opengl.lpr 2006/08/21 04:28:29 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)

--- /project/cello/cvsroot/cello/kt-opengl/ogl-macros.lisp 2006/07/06 22:09:11 1.5 +++ /project/cello/cvsroot/cello/kt-opengl/ogl-macros.lisp 2006/08/21 04:28:29 1.6 @@ -48,7 +48,7 @@ (defun call-with-matrix (load-identity-p matrix-fn matrix-code) (let* ((mm-pushed (get-matrix-mode)) (sd-pushed (get-stack-depth mm-pushed))) - (ukt::wtrc (0 100 "with-matrix starts with mode" (matrix-mode-symbol mm-pushed) :depth sd-pushed) + (cells:wtrc (0 100 "with-matrix starts with mode" (matrix-mode-symbol mm-pushed) :depth sd-pushed) (gl-push-matrix) (unwind-protect (progn @@ -60,7 +60,7 @@ (assert (eql mm-pushed (get-matrix-mode))() "matrix-mode left as ~a instead of ~a by form ~a" (ogl::get-matrix-mode) mm-pushed matrix-code) - (ukt:trc "poppping matrix!!!!!" (matrix-mode-symbol (get-matrix-mode)) :from-depth (get-stack-depth (get-matrix-mode))) + (cells:trc "poppping matrix!!!!!" (matrix-mode-symbol (get-matrix-mode)) :from-depth (get-stack-depth (get-matrix-mode))) (gl-pop-matrix) (assert (eql sd-pushed (get-stack-depth mm-pushed))() "matrix depth deviated ~d during ~a" @@ -80,8 +80,7 @@ (prog1 (funcall attrib-fn) (glec :with-attrib)) - (gl-pop-attrib) - )) + (gl-pop-attrib)))

(defmacro with-client-attrib ((&rest attribs) &body body) `(call-with-client-attrib @@ -95,8 +94,7 @@ (prog1 (funcall attrib-fn) (glec :with-client-attrib)) - (gl-pop-client-attrib) - )) + (gl-pop-client-attrib)))

(defvar *gl-begun*) (defvar *gl-stop*) @@ -147,14 +145,14 @@

(defun glec (&optional (id :anon)) (if (and (boundp '*gl-begun*) *gl-begun*) - (progn #+shhh (ukt:trc "not checking error inside gl-begin" id)) + (progn #+shhh (cells:trc "not checking error inside gl-begin" id)) (let ((e (glgeterror))) (if (zerop e) (unless t ;; (find id '(glutcheckloop glutgetwindow)) (print `(cool ,id))) (if t ;; (null (find id '(glutInitDisplayMode glutInitWindowSize))) (if (boundp '*gl-stop*) - (ukt:trc "error but *gl-stop* already bound" e id) + (cells:trc "error but *gl-stop* already bound" e id) (progn (setf *gl-stop* t) (format t "~&~%OGL error ~a at ID ~a" e id) --- /project/cello/cvsroot/cello/kt-opengl/ogl-utils.lisp 2006/07/06 22:09:12 1.3 +++ /project/cello/cvsroot/cello/kt-opengl/ogl-utils.lisp 2006/08/21 04:28:29 1.4 @@ -49,7 +49,7 @@

(let (gl-s-plane gl-t-plane gl-r-plane gl-q-plane) (defun ogl-tex-gen-setup (mode tex-env tex-wrap scale &rest planes) - ;;(ukt::trc nil "ogl-tex-gen-setup:" mode tex-env tex-wrap scale planes) + ;;(trc nil "ogl-tex-gen-setup:" mode tex-env tex-wrap scale planes) (gl-tex-envf gl_texture_env gl_texture_env_mode tex-env) (gl-tex-parameterf gl_texture_2d gl_texture_min_filter gl_linear ) (gl-tex-parameterf gl_texture_2d gl_texture_mag_filter gl_linear ) @@ -199,7 +199,7 @@ (ogl-pen-move (- (car ,xy)) (- (cdr ,xy)))))))

(defun ogl-pen-move (x y) - ;;(ukt::trc "ogl-pen-moving" x y) + ;;(trc "ogl-pen-moving" x y) (gl-bitmap 0 0 0 0 x y (cffi-uffi-compat:make-null-pointer :void)))

(defclass ogl-texture ()