[cello-cvs] CVS cello/kt-opengl

[ktilton]

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

Modified Files:
	kt-opengl.asd ogl-macros.lisp ogl-utils.lisp 
Log Message:


--- /project/cello/cvsroot/cello/kt-opengl/kt-opengl.asd	2006/05/27 06:01:38	1.1
+++ /project/cello/cvsroot/cello/kt-opengl/kt-opengl.asd	2006/07/06 22:09:11	1.2
@@ -13,7 +13,7 @@
   :licence "MIT"
   :description "Partial OpenGL Bindings"
   :long-description "Poorly implemented bindings to half of OpenGL"
-  :depends-on (:cffi-extender)
+  :depends-on (:cffi-extender :cells)
   :serial t
   :components ((:file "kt-opengl")
                (:file "gl-def")
--- /project/cello/cvsroot/cello/kt-opengl/ogl-macros.lisp	2006/07/03 00:35:16	1.4
+++ /project/cello/cvsroot/cello/kt-opengl/ogl-macros.lisp	2006/07/06 22:09:11	1.5
@@ -24,7 +24,7 @@
 
 (in-package :kt-opengl)
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (export '(with-gl-translation)))
 
 (defvar *stack-depth*
@@ -44,19 +44,6 @@
         (funcall matrix-fn))
     (gl-pop-matrix)))
 
-(defun get-stack-depth (mm)
-  (gl-get-integerv
-   (ecase (matrix-mode-symbol mm)
-     (gl_modelview gl_modelview_stack_depth)
-     (gl_projection gl_projection_stack_depth)
-     (gl_texture gl_texture_stack_depth))
-   *stack-depth*)
-  (aforef *stack-depth* 0))
-
-(defun get-matrix-mode ()
-  (gl-get-integerv gl_matrix_mode *ogl-int*)
-  (eltgli *ogl-int* 0))
-
 #+debugversion
 (defun call-with-matrix (load-identity-p matrix-fn matrix-code)
   (let* ((mm-pushed (get-matrix-mode))
--- /project/cello/cvsroot/cello/kt-opengl/ogl-utils.lisp	2006/06/05 01:47:50	1.2
+++ /project/cello/cvsroot/cello/kt-opengl/ogl-utils.lisp	2006/07/06 22:09:12	1.3
@@ -177,6 +177,19 @@
 (defun ogl-raster-pos-get ()
   (gl-get-ints-4 gl_current_raster_position))
 
+(defun get-stack-depth (mm)
+  (gl-get-integerv
+   (ecase (matrix-mode-symbol mm)
+     (gl_modelview gl_modelview_stack_depth)
+     (gl_projection gl_projection_stack_depth)
+     (gl_texture gl_texture_stack_depth))
+   *stack-depth*)
+  (aforef *stack-depth* 0))
+
+(defun get-matrix-mode ()
+  (gl-get-integerv gl_matrix_mode *ogl-int*)
+  (eltgli *ogl-int* 0))
+
 (defmacro with-bitmap-shifted ((x y) &body body)
   (let ((xy (gensym)))
   `(let ((,xy (cons ,x ,y)))