[cells-cvs] CVS update: cell-cultures/cl-opengl/cl-opengl.lisp cell-cultures/cl-opengl/glut-functions.lisp

[Kenny Tilton]

Update of /project/cells/cvsroot/cell-cultures/cl-opengl
In directory common-lisp.net:/tmp/cvs-serv19757/cl-opengl

Modified Files:
	cl-opengl.lisp glut-functions.lisp 
Log Message:
Patches to support cells-gtk; ongoing glut refinements cello osx port
Date: Wed Nov 17 13:31:45 2004
Author: ktilton

Index: cell-cultures/cl-opengl/cl-opengl.lisp
diff -u cell-cultures/cl-opengl/cl-opengl.lisp:1.4 cell-cultures/cl-opengl/cl-opengl.lisp:1.5
--- cell-cultures/cl-opengl/cl-opengl.lisp:1.4	Thu Oct 28 02:09:33 2004
+++ cell-cultures/cl-opengl/cl-opengl.lisp	Wed Nov 17 13:31:45 2004
@@ -60,7 +60,8 @@
     #:ogl-bounds #:ogl-scissor-box #:ogl-raster-pos-get
     #:ogl-pen-move #:with-bitmap-shifted
     #:texture-name
-    #:eltgli #:ogl-tex-activate #:gl-name))
+    #:eltgli #:ogl-tex-activate #:gl-name
+    #:mgwclose #:freeg #:glut-bitmap-string #:glut-stroke-string))
 
 (in-package :cl-opengl)
 


Index: cell-cultures/cl-opengl/glut-functions.lisp
diff -u cell-cultures/cl-opengl/glut-functions.lisp:1.1 cell-cultures/cl-opengl/glut-functions.lisp:1.2
--- cell-cultures/cl-opengl/glut-functions.lisp:1.1	Sat Jun 26 20:38:41 2004
+++ cell-cultures/cl-opengl/glut-functions.lisp	Wed Nov 17 13:31:45 2004
@@ -121,37 +121,37 @@
 
 #| glut window callback sub-api. |#
 
-(defun-ffx :void "glut" "glutCloseFunc" (:long lpfn)) ;; (*func)(void)
-(defun-ffx :void "glut" "glutWMCloseFunc" (:long lpfn)) ;; (*func)(void) ;; same
-(defun-ffx :void "glut" "glutDisplayFunc" (:long lpfn)) ;; (*func)(void)
-(defun-ffx :void "glut" "glutReshapeFunc" (:long lpfn)) ;; (*func)(int width (), int height));
-(defun-ffx :void "glut" "glutKeyboardFunc" (:long lpfn)) ;; (*func)(unsigned char key, int x, int y));
-(defun-ffx :void "glut" "glutMouseFunc" (:long lpfn)) ;; (*func)(int button, int state, int x, int y));
-(defun-ffx :void "glut" "glutMotionFunc" (:long lpfn)) ;; (*func)(int x, int y));
-(defun-ffx :void "glut" "glutPassiveMotionFunc" (:long lpfn)) ;; (*func)(int x, int y));
-(defun-ffx :void "glut" "glutEntryFunc" (:long lpfn)) ;; (*func)(int state));
-(defun-ffx :void "glut" "glutVisibilityFunc" (:long lpfn)) ;; (*func)(int state));
-(defun-ffx :void "glut" "glutIdleFunc" (:long lpfn)) ;; (*func)(void));
+(defun-ffx :void "glut" "glutCloseFunc" (:void *lpfn)) ;; (*func)(void)
+(defun-ffx :void "glut" "glutWMCloseFunc" (:void *lpfn)) ;; (*func)(void) ;; same
+(defun-ffx :void "glut" "glutDisplayFunc" (:void *lpfn)) ;; (*func)(void)
+(defun-ffx :void "glut" "glutReshapeFunc" (:void *lpfn)) ;; (*func)(int width (), int height));
+(defun-ffx :void "glut" "glutKeyboardFunc" (:void *lpfn)) ;; (*func)(unsigned char key, int x, int y));
+(defun-ffx :void "glut" "glutMouseFunc" (:void *lpfn)) ;; (*func)(int button, int state, int x, int y));
+(defun-ffx :void "glut" "glutMotionFunc" (:void *lpfn)) ;; (*func)(int x, int y));
+(defun-ffx :void "glut" "glutPassiveMotionFunc" (:void *lpfn)) ;; (*func)(int x, int y));
+(defun-ffx :void "glut" "glutEntryFunc" (:void *lpfn)) ;; (*func)(int state));
+(defun-ffx :void "glut" "glutVisibilityFunc" (:void *lpfn)) ;; (*func)(int state));
+(defun-ffx :void "glut" "glutIdleFunc" (:void *lpfn)) ;; (*func)(void));
 (defun-ffx :void "glut" "glutTimerFunc" (gluint millis :long lpfn)) ;; (int value), int value);
-(defun-ffx :void "glut" "glutMenuStateFunc" (:long lpfn)) ;; (*func)(int state));
+(defun-ffx :void "glut" "glutMenuStateFunc" (:void *lpfn)) ;; (*func)(int state));
 
-(defun-ffx :void "glut" "glutSpecialFunc" (:long lpfn)) ;; (*func)(int key, int x, int y));
-(defun-ffx :void "glut" "glutSpaceballMotionFunc" (:long lpfn)) ;; (*func)(int x, int y, int z));
-(defun-ffx :void "glut" "glutSpaceballRotateFunc" (:long lpfn)) ;; (*func)(int x, int y, int z));
-(defun-ffx :void "glut" "glutSpaceballButtonFunc" (:long lpfn)) ;; (*func)(int button, int state));
-(defun-ffx :void "glut" "glutButtonBoxFunc" (:long lpfn)) ;; (*func)(int button, int state));
-(defun-ffx :void "glut" "glutDialsFunc" (:long lpfn)) ;; (*func)(int dial, int value));
-(defun-ffx :void "glut" "glutTabletMotionFunc" (:long lpfn)) ;; (*func)(int x, int y));
-(defun-ffx :void "glut" "glutTabletButtonFunc" (:long lpfn)) ;; (*func)(int button, int state, int x, int y));
+(defun-ffx :void "glut" "glutSpecialFunc" (:void *lpfn)) ;; (*func)(int key, int x, int y));
+(defun-ffx :void "glut" "glutSpaceballMotionFunc" (:void *lpfn)) ;; (*func)(int x, int y, int z));
+(defun-ffx :void "glut" "glutSpaceballRotateFunc" (:void *lpfn)) ;; (*func)(int x, int y, int z));
+(defun-ffx :void "glut" "glutSpaceballButtonFunc" (:void *lpfn)) ;; (*func)(int button, int state));
+(defun-ffx :void "glut" "glutButtonBoxFunc" (:void *lpfn)) ;; (*func)(int button, int state));
+(defun-ffx :void "glut" "glutDialsFunc" (:void *lpfn)) ;; (*func)(int dial, int value));
+(defun-ffx :void "glut" "glutTabletMotionFunc" (:void *lpfn)) ;; (*func)(int x, int y));
+(defun-ffx :void "glut" "glutTabletButtonFunc" (:void *lpfn)) ;; (*func)(int button, int state, int x, int y));
 
-(defun-ffx :void "glut" "glutMenuStatusFunc" (:long lpfn)) ;; (*func)(int status, int x, int y));
-(defun-ffx :void "glut" "glutOverlayDisplayFunc" (:long lpfn)) ;; (*func)(void));
+(defun-ffx :void "glut" "glutMenuStatusFunc" (:void *lpfn)) ;; (*func)(int status, int x, int y));
+(defun-ffx :void "glut" "glutOverlayDisplayFunc" (:void *lpfn)) ;; (*func)(void));
 
-(defun-ffx :void "glut" "glutWindowStatusFunc" (:long lpfn)) ;; (*func)(int state));
+(defun-ffx :void "glut" "glutWindowStatusFunc" (:void *lpfn)) ;; (*func)(int state));
 
-(defun-ffx :void "glut" "glutKeyboardUpFunc" (:long lpfn)) ;; (*func)(unsigned char key, int x, int y));
-(defun-ffx :void "glut" "glutSpecialUpFunc" (:long lpfn)) ;; (*func)(int key, int x, int y));
-(defun-ffx :void "glut" "glutJoystickFunc" (:long lpfn)) ;; (*func)(unsigned int buttonMask, int x, int y, int z), int pollInterval);
+(defun-ffx :void "glut" "glutKeyboardUpFunc" (:void *lpfn)) ;; (*func)(unsigned char key, int x, int y));
+(defun-ffx :void "glut" "glutSpecialUpFunc" (:void *lpfn)) ;; (*func)(int key, int x, int y));
+(defun-ffx :void "glut" "glutJoystickFunc" (:void *lpfn)) ;; (*func)(unsigned int buttonMask, int x, int y, int z), int pollInterval);
 
 #| glut color index sub-api. |#
 (defun-ffx :void "glut" "glutSetColor" (:int cell glfloat red glfloat green glfloat blue))