Update of /project/cello/cvsroot/cl-opengl In directory common-lisp.net:/tmp/cvs-serv25325

Modified Files: cl-opengl-config.lisp cl-opengl.lpr glu-functions.lisp ogl-utils.lisp Log Message: OSX merge Date: Wed Jun 15 23:09:09 2005 Author: ktilton

Index: cl-opengl/cl-opengl-config.lisp diff -u cl-opengl/cl-opengl-config.lisp:1.1 cl-opengl/cl-opengl-config.lisp:1.2 --- cl-opengl/cl-opengl-config.lisp:1.1 Wed May 25 05:14:30 2005 +++ cl-opengl/cl-opengl-config.lisp Wed Jun 15 23:09:09 2005 @@ -39,6 +39,6 @@ (defparameter *glut-dynamic-lib* (make-pathname #+lispworks :host #-lispworks :device "c" - :directory '(:absolute "cell-cultures" "cell-cultures-user" "dynlib") + :directory '(:absolute "0dev" "user" "dynlib") :name "freeglut" :type "dll"))

Index: cl-opengl/cl-opengl.lpr diff -u cl-opengl/cl-opengl.lpr:1.1 cl-opengl/cl-opengl.lpr:1.2 --- cl-opengl/cl-opengl.lpr:1.1 Wed May 25 05:14:30 2005 +++ cl-opengl/cl-opengl.lpr Wed Jun 15 23:09:09 2005 @@ -1,4 +1,4 @@ -;; -*- lisp-version: "7.0 [Windows] (May 6, 2005 8:25)"; cg: "1.54.2.17"; -*- +;; -*- lisp-version: "7.0 [Windows] (Jun 10, 2005 13:34)"; cg: "1.54.2.17"; -*-

(in-package :cg-user)

Index: cl-opengl/glu-functions.lisp diff -u cl-opengl/glu-functions.lisp:1.1 cl-opengl/glu-functions.lisp:1.2 --- cl-opengl/glu-functions.lisp:1.1 Wed May 25 05:14:31 2005 +++ cl-opengl/glu-functions.lisp Wed Jun 15 23:09:09 2005 @@ -167,6 +167,7 @@ glenum type :void *data))

+ (defun-ogl :void "gl-util" "gluCylinder" (:void *qobj gldouble base-radius gldouble top-radius gldouble height @@ -197,8 +198,8 @@

;;;(defun-ogl GLUtesselator *"gl-util" "gluNewTess" ()) ;;;(defun-ogl void "gl-util" "gluNextContour" (GLUtesselator *tess GLenum type)) -;;;(defun-ogl :void "gl-util" "gluOrtho2D" (GLdouble left GLdouble right -;;; GLdouble bottom GLdouble top)) +(defun-ogl :void "gl-util" "gluOrtho2D" (GLdouble left GLdouble right + GLdouble bottom GLdouble top)) ;;;(defun-ogl void "gl-util" "gluPartialDisk" (GLUquadric *quad GLdouble inner GLdouble outer GLint slices GLint loops GLdouble start GLdouble sweep))

Index: cl-opengl/ogl-utils.lisp diff -u cl-opengl/ogl-utils.lisp:1.1 cl-opengl/ogl-utils.lisp:1.2 --- cl-opengl/ogl-utils.lisp:1.1 Wed May 25 05:14:31 2005 +++ cl-opengl/ogl-utils.lisp Wed Jun 15 23:09:09 2005 @@ -27,6 +27,8 @@ (in-package :cl-opengl)

(defun ogl-tex-activate (tex-name) + (assert tex-name) + ;;(print `(ogl-tex-activate doing ,tex-name)) (gl-bind-texture gl_texture_2d tex-name) (gl-enable gl_texture_2d) (gl-polygon-mode gl_front_and_back gl_fill) ;; just front?