[cells-cvs] CVS update: cell-cultures/cl-opengl/cl-opengl.asd cell-cultures/cl-opengl/cl-opengl.lisp cell-cultures/cl-opengl/gl-functions.lisp cell-cultures/cl-opengl/ogl-utils.lisp
Kenny Tilton
ktilton at common-lisp.net
Thu Oct 28 00:09:40 UTC 2004
Update of /project/cells/cvsroot/cell-cultures/cl-opengl
In directory common-lisp.net:/tmp/cvs-serv27567/cl-opengl
Modified Files:
cl-opengl.asd cl-opengl.lisp gl-functions.lisp ogl-utils.lisp
Log Message:
Re-port to Lispworks/win32
Date: Thu Oct 28 02:09:33 2004
Author: ktilton
Index: cell-cultures/cl-opengl/cl-opengl.asd
diff -u cell-cultures/cl-opengl/cl-opengl.asd:1.1 cell-cultures/cl-opengl/cl-opengl.asd:1.2
--- cell-cultures/cl-opengl/cl-opengl.asd:1.1 Sat Jun 26 20:38:40 2004
+++ cell-cultures/cl-opengl/cl-opengl.asd Thu Oct 28 02:09:33 2004
@@ -15,17 +15,20 @@
:maintainer "Kenny Tilton <ktilton at nyc.rr.com>"
:licence "MIT"
:description "Partial OpenGL Bindings"
- :long-description "Poorly implemented bindings to half of OpenGL"
+ :long-description "Bindings to most of OpenGL, more on demand"
:perform (load-op :after (op cl-opengl)
(pushnew :cl-opengl cl:*features*))
+ :depends-on (:utils-kt :ffi-extender)
+ :serial t
:components ((:file "cl-opengl")
(:file "gl-def" :depends-on ("cl-opengl"))
(:file "gl-constants" :depends-on ("gl-def"))
- (:file "gl-functions" :depends-on ("gl-constants"))
- (:file "glu-functions" :depends-on ("gl-functions"))
- (:file "glut-functions" :depends-on ("glu-functions"))
- (:file "glut-def" :depends-on ("glut-functions"))
- (:file "glut-extras" :depends-on ("glut-def"))
- (:file "ogl-macros" :depends-on ("glut-extras"))
- (:file "ogl-utils" :depends-on ("ogl-macros"))
- (:file "nehe-14" :depends-on ("ogl-utils"))))
+ (:file "gl-functions" :depends-on ("gl-def"))
+ (:file "glu-functions" :depends-on ("gl-def"))
+ (:file "glut-functions" :depends-on ("gl-def"))
+ (:file "glut-def" :depends-on ("gl-def"))
+ (:file "glut-extras" :depends-on ("gl-def"))
+ (:file "ogl-macros" :depends-on ("gl-def"))
+ (:file "ogl-utils" :depends-on ("gl-def"))
+ (:file "nehe-14" :depends-on ("gl-def"))
+ ))
Index: cell-cultures/cl-opengl/cl-opengl.lisp
diff -u cell-cultures/cl-opengl/cl-opengl.lisp:1.3 cell-cultures/cl-opengl/cl-opengl.lisp:1.4
--- cell-cultures/cl-opengl/cl-opengl.lisp:1.3 Fri Oct 1 06:01:29 2004
+++ cell-cultures/cl-opengl/cl-opengl.lisp Thu Oct 28 02:09:33 2004
@@ -59,7 +59,7 @@
#: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
- #:texture-name #:ogl-list-cache #:ogl-lists-delete
+ #:texture-name
#:eltgli #:ogl-tex-activate #:gl-name))
(in-package :cl-opengl)
@@ -69,8 +69,8 @@
(defparameter *glut-dynamic-lib* :unconfigured)
(eval-when (compile load)
- (load (merge-pathnames "cl-opengl-config.lisp"
- cl-user::*cello-config-directory*)))
+ (load (merge-pathnames "cl-opengl-config"
+ cl-user::*cell-cultures-config*)))
(defparameter *opengl-dll* nil)
Index: cell-cultures/cl-opengl/gl-functions.lisp
diff -u cell-cultures/cl-opengl/gl-functions.lisp:1.3 cell-cultures/cl-opengl/gl-functions.lisp:1.4
--- cell-cultures/cl-opengl/gl-functions.lisp:1.3 Fri Oct 1 06:01:29 2004
+++ cell-cultures/cl-opengl/gl-functions.lisp Thu Oct 28 02:09:33 2004
@@ -357,7 +357,8 @@
(glsizei width glsizei height glenum format glenum type glvoid *pixels))
(defun-ogl :void "open-gl" "glCopyPixels" ( glint x glint y glsizei width glsizei height glenum type ))
-/* stenciling */
+#| stenciling |#
+
(defun-ogl :void "open-gl" "glStencilFunc" ( glenum func glint ref gluint mask ))
(defun-ogl :void "open-gl" "glStencilMask" ( gluint mask ))
(defun-ogl :void "open-gl" "glStencilOp" ( glenum fail glenum zfail glenum zpass ))
Index: cell-cultures/cl-opengl/ogl-utils.lisp
diff -u cell-cultures/cl-opengl/ogl-utils.lisp:1.4 cell-cultures/cl-opengl/ogl-utils.lisp:1.5
--- cell-cultures/cl-opengl/ogl-utils.lisp:1.4 Tue Oct 19 05:47:37 2004
+++ cell-cultures/cl-opengl/ogl-utils.lisp Thu Oct 28 02:09:33 2004
@@ -209,36 +209,6 @@
((texture-name :accessor texture-name :initform nil)
(texture-precedence :accessor texture-precedence :initform 0)))
-(defparameter *ogl-display-lists* nil)
-
-(defmethod ogl-lists-delete (node)
- (dsp-lists-delete (ogl-list-cache node)))
-
-(defmethod ogl-list-cache (other)
- (declare (ignore other))
- *ogl-display-lists*)
-
-(defmethod (setf ogl-list-cache) (new-value other)
- (declare (ignore other))
- (setf *ogl-display-lists* new-value))
-
-(defun dsp-lists-delete (list-cache)
- (dolist (k-dl list-cache)
- (gl-delete-lists (cdr k-dl) 1)))
-
-(defun dsp-list-store (list node keys)
- (push (cons keys list) (ogl-list-cache node)))
-
-(defun dsp-list-lookup (keys list)
- (cdr (assoc keys list :test 'equal)))
-
-(defun dsp-list-dump (node)
- (format t "display-lists for ~a" node)
- (loop for (key . list) in (ogl-list-cache node)
- do (format t "~d : ~a" list key)))
-
-(defparameter *new-listing* nil)
-
(defun flatten (&rest args)
(mapcan (lambda (arg)
(if (consp arg)
More information about the Cells-cvs
mailing list