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

Modified Files: kt-opengl.lisp ogl-utils.lisp Log Message: Beginnings only of merge with Celtk

--- /project/cello/cvsroot/cello/kt-opengl/kt-opengl.lisp 2006/06/03 12:06:02 1.2 +++ /project/cello/cvsroot/cello/kt-opengl/kt-opengl.lisp 2006/06/05 01:47:50 1.3 @@ -55,7 +55,7 @@ #:ncalc-normalf #:ncalc-normalfv #:ogl-get-int #:ogl-get-boolean #:v3f #:make-v3f #:v3f-x #:v3f-y #:v3f-z #:with-gl-param #:xlin #:xlout - #:ups #:ups-most #:ups-more #:downs #:downs-most #:downs-more #:farther #:nearer + #:farther #:nearer #:ogl-texture-delete #:ogl-texture-gen #:ogl-tex-gen-setup #:ogl-bounds #:ogl-scissor-box #:ogl-raster-pos-get #:ogl-pen-move #:with-bitmap-shifted --- /project/cello/cvsroot/cello/kt-opengl/ogl-utils.lisp 2006/05/27 06:01:39 1.1 +++ /project/cello/cvsroot/cello/kt-opengl/ogl-utils.lisp 2006/06/05 01:47:50 1.2 @@ -85,24 +85,6 @@ (loop for n below 4 collecting (eltgli ff-box n)))

-(defun ups (&rest values) - (apply '+ values)) - -(defun ups-more (&rest values) - (apply '> values)) - -(defun ups-most (&rest values) - (apply 'max values)) - -(defun downs (&rest values) - (apply '- values)) - -(defun downs-most (&rest values) - (apply 'min values)) - -(defun downs-more (&rest values) - (apply '< values)) - (defun farther (&rest values) (apply '- values)) (defun xlin (&rest values) ;; yep. moves matrix, not object