Update of /project/cello/cvsroot/cello/kt-opengl In directory clnet:/tmp/cvs-serv2070/kt-opengl
Modified Files: colors.lisp defpackage.lisp gl-constants.lisp gl-def.lisp gl-functions.lisp glu-functions.lisp kt-opengl-config.lisp kt-opengl.lisp kt-opengl.lpr ogl-macros.lisp ogl-utils.lisp Log Message:
--- /project/cello/cvsroot/cello/kt-opengl/colors.lisp 2006/11/13 05:29:31 1.8 +++ /project/cello/cvsroot/cello/kt-opengl/colors.lisp 2007/02/02 20:11:17 1.9 @@ -1,6 +1,6 @@ ;;; -*- mode: Lisp; Syntax: Common-Lisp; Package: kt-opengl; -*- ;;; -;;; Copyright © 2006 by Kenneth William Tilton +;;; Copyright (c) 2006 by Kenneth William Tilton ;;; ;;; Permission is hereby granted, free of charge, to any person obtaining a ;;; copy of this software and associated documentation files (the "Software"), @@ -20,7 +20,7 @@ ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ;;; DEALINGS IN THE SOFTWARE. ;;; -;;; $Id: colors.lisp,v 1.8 2006/11/13 05:29:31 ktilton Exp $ +;;; $Id: colors.lisp,v 1.9 2007/02/02 20:11:17 ktilton Exp $
(in-package #:kt-opengl)
@@ -33,12 +33,13 @@ (g 0 ) (b 0 ))
-(defstruct rgba (r 0.0f0) - (g 0.0f0) - (b 0.0f0) - (a 1.0f0) - (fo 0) ;; fo = foreign ptr address - (id nil)) +(defstruct rgba + (r 0.0f0) + (g 0.0f0) + (b 0.0f0) + (a 1.0f0) + (fo 0) ;; fo = foreign ptr address + (id nil))
(defparameter *known-colors* '() "Known colors, safed as cons of color-name and rgba-color struct.") @@ -90,7 +91,14 @@ (defmacro define-ogl-rgba-color (color-name red green blue alpha) `(let ((rgba-color (mk-rgba ,red ,green ,blue ,alpha ',color-name))) (prog1 - (defconstant ,color-name rgba-color) + ;; Possibly due to aggressive compile settings, OpenMCL will try + ;; to inline these constants and fail because there's no + ;; appropriate MAKE-LOAD-FORM method. I'm not sure whether + ;; inlining it is a good idea because the RGBA-COLOR structure + ;; contains a foreign pointer. So, for now, let's avoid inlining + ;; instead of writing a MAKE-LOAD-FORM method for this + ;; structure. --luis + (#-openmcl defconstant #+openmcl defparameter ,color-name rgba-color) (pushnew rgba-color *known-colors*) (utils-kt::export! ,color-name))))
--- /project/cello/cvsroot/cello/kt-opengl/defpackage.lisp 2006/10/01 20:45:04 1.2 +++ /project/cello/cvsroot/cello/kt-opengl/defpackage.lisp 2007/02/02 20:11:18 1.3 @@ -1,6 +1,6 @@ ;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- ;;; -;;; Copyright © 2004 by Kenneth William Tilton. +;;; Copyright (c) 2004 by Kenneth William Tilton. ;;; ;;; Permission is hereby granted, free of charge, to any person obtaining a copy ;;; of this software and associated documentation files (the "Software"), to deal @@ -20,7 +20,7 @@ ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ;;; IN THE SOFTWARE.
-;;; $Id: defpackage.lisp,v 1.2 2006/10/01 20:45:04 fgoenninger Exp $ +;;; $Id: defpackage.lisp,v 1.3 2007/02/02 20:11:18 ktilton Exp $
(pushnew :kt-opengl *features*)
--- /project/cello/cvsroot/cello/kt-opengl/gl-constants.lisp 2006/07/03 00:35:15 1.2 +++ /project/cello/cvsroot/cello/kt-opengl/gl-constants.lisp 2007/02/02 20:11:18 1.3 @@ -1,6 +1,6 @@ ;; -*- mode: Lisp; Syntax: Common-Lisp; Package: kt-opengl; -*- ;;; -;;; Copyright © 1995,2003 by Kenneth William Tilton. +;;; Copyright (c) 1995,2003 by Kenneth William Tilton. ;;; ;;; Permission is hereby granted, free of charge, to any person obtaining a copy ;;; of this software and associated documentation files (the "Software"), to deal --- /project/cello/cvsroot/cello/kt-opengl/gl-def.lisp 2006/08/28 21:45:27 1.3 +++ /project/cello/cvsroot/cello/kt-opengl/gl-def.lisp 2007/02/02 20:11:18 1.4 @@ -1,6 +1,6 @@ ;; -*- mode: Lisp; Syntax: Common-Lisp; Package: kt-opengl; -*- ;;; -;;; Copyright © 1995,2003 by Kenneth William Tilton. +;;; Copyright (c) 1995,2003 by Kenneth William Tilton. ;;; ;;; Permission is hereby granted, free of charge, to any person obtaining a copy ;;; of this software and associated documentation files (the "Software"), to deal --- /project/cello/cvsroot/cello/kt-opengl/gl-functions.lisp 2006/08/28 21:45:27 1.4 +++ /project/cello/cvsroot/cello/kt-opengl/gl-functions.lisp 2007/02/02 20:11:19 1.5 @@ -1,6 +1,6 @@ ;; -*- mode: Lisp; Syntax: Common-Lisp; Package: kt-opengl; -*- ;;; -;;; Copyright © 1995,2003 by Kenneth William Tilton. +;;; Copyright (c) 1995,2003 by Kenneth William Tilton. ;;; ;;; Permission is hereby granted, free of charge, to any person obtaining a copy ;;; of this software and associated documentation files (the "Software"), to deal --- /project/cello/cvsroot/cello/kt-opengl/glu-functions.lisp 2006/08/28 21:45:27 1.3 +++ /project/cello/cvsroot/cello/kt-opengl/glu-functions.lisp 2007/02/02 20:11:19 1.4 @@ -1,6 +1,6 @@ ;; -*- mode: Lisp; Syntax: Common-Lisp; Package: kt-opengl; -*- ;;; -;;; Copyright © 1995,2003 by Kenneth William Tilton. +;;; Copyright (c) 1995,2003 by Kenneth William Tilton. ;;; ;;; Permission is hereby granted, free of charge, to any person obtaining a copy ;;; of this software and associated documentation files (the "Software"), to deal --- /project/cello/cvsroot/cello/kt-opengl/kt-opengl-config.lisp 2006/10/01 12:28:20 1.1 +++ /project/cello/cvsroot/cello/kt-opengl/kt-opengl-config.lisp 2007/02/02 20:11:19 1.2 @@ -1,6 +1,6 @@ ;; -*- mode: Lisp; Syntax: Common-Lisp; Package: cello; -*- ;;; -;;; Copyright © 2004 by Kenneth William Tilton. +;;; Copyright (c) 2004 by Kenneth William Tilton. ;;; ;;; Permission is hereby granted, free of charge, to any person obtaining a copy ;;; of this software and associated documentation files (the "Software"), to deal --- /project/cello/cvsroot/cello/kt-opengl/kt-opengl.lisp 2006/10/13 05:57:28 1.11 +++ /project/cello/cvsroot/cello/kt-opengl/kt-opengl.lisp 2007/02/02 20:11:19 1.12 @@ -1,7 +1,7 @@ ;;________________________________________________________ ;; ;;; -;;; Copyright © 2004 by Kenneth William Tilton. +;;; Copyright (c) 2004 by Kenneth William Tilton. ;;; ;;; Permission is hereby granted, free of charge, to any person obtaining a copy ;;; of this software and associated documentation files (the "Software"), to deal @@ -21,11 +21,10 @@ ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ;;; IN THE SOFTWARE.
-;;; $Id: kt-opengl.lisp,v 1.11 2006/10/13 05:57:28 ktilton Exp $ +;;; $Id: kt-opengl.lisp,v 1.12 2007/02/02 20:11:19 ktilton Exp $
(pushnew :kt-opengl *features*)
- (in-package :kt-opengl)
(defvar *selecting*) @@ -35,15 +34,15 @@ (defun kt-opengl-init () (unless *opengl-dll* (progn - (let ((opengl-loaded-p - (use-foreign-library OpenGL)) - (glu-loaded-p - #+macosx - t ;; on Mac OS X, no explicit loading of GLU needed. - #-macosx - (use-foreign-library GLU))) - (assert (and opengl-loaded-p glu-loaded-p)) - (setf *opengl-dll* t))))) + (let ((opengl-loaded-p + (use-foreign-library OpenGL)) + (glu-loaded-p + #+macosx + t ;; on Mac OS X, no explicit loading of GLU needed. + #-macosx + (use-foreign-library GLU))) + (assert (and opengl-loaded-p glu-loaded-p)) + (setf *opengl-dll* t)))))
(defun kt-opengl-reset () (loop for ec = (glgeterror) --- /project/cello/cvsroot/cello/kt-opengl/kt-opengl.lpr 2006/11/13 05:29:31 1.8 +++ /project/cello/cvsroot/cello/kt-opengl/kt-opengl.lpr 2007/02/02 20:11:19 1.9 @@ -1,4 +1,4 @@ -;; -*- lisp-version: "8.0 [Windows] (Nov 6, 2006 16:43)"; cg: "1.81"; -*- +;; -*- lisp-version: "8.0 [Windows] (Jan 22, 2007 8:01)"; cg: "1.81"; -*-
(in-package :cg-user)
--- /project/cello/cvsroot/cello/kt-opengl/ogl-macros.lisp 2006/10/01 20:42:51 1.10 +++ /project/cello/cvsroot/cello/kt-opengl/ogl-macros.lisp 2007/02/02 20:11:19 1.11 @@ -2,7 +2,7 @@ ;;________________________________________________________ ;; ;;; -;;; Copyright © 2004 by Kenneth William Tilton. +;;; Copyright (c) 2004 by Kenneth William Tilton. ;;; ;;; Permission is hereby granted, free of charge, to any person obtaining a copy ;;; of this software and associated documentation files (the "Software"), to deal --- /project/cello/cvsroot/cello/kt-opengl/ogl-utils.lisp 2006/10/02 03:55:23 1.9 +++ /project/cello/cvsroot/cello/kt-opengl/ogl-utils.lisp 2007/02/02 20:11:19 1.10 @@ -2,7 +2,7 @@ ;;________________________________________________________ ;; ;;; -;;; Copyright © 2004 by Kenneth William Tilton. +;;; Copyright (c) 2004 by Kenneth William Tilton. ;;; ;;; Permission is hereby granted, free of charge, to any person obtaining a copy ;;; of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ;;; IN THE SOFTWARE.
-;;; $Id: ogl-utils.lisp,v 1.9 2006/10/02 03:55:23 ktilton Exp $ +;;; $Id: ogl-utils.lisp,v 1.10 2007/02/02 20:11:19 ktilton Exp $
(declaim (optimize (debug 1) (speed 3) (safety 1) (compilation-speed 0)))
@@ -42,19 +42,19 @@ ;;; ===========================================================================
(defstruct v3i - (x :type GLint) - (y :type GLint) - (z :type GLint)) + (x 0 :type GLint) + (y 0 :type GLint) + (z 0 :type GLint))
(defstruct v3f - (x :type GLfloat) - (y :type GLfloat) - (z :type GLfloat)) + (x 0.0s0 :type GLfloat) + (y 0.0s0 :type GLfloat) + (z 0.0s0 :type GLfloat))
(defstruct v3d - (x :type GLdouble) - (y :type GLdouble) - (z :type GLdouble)) + (x 0.0d0 :type GLdouble) + (y 0.0d0 :type GLdouble) + (z 0.0d0 :type GLdouble))
;;; =========================================================================== ;;; FUNCTIONS