Update of /project/cello/cvsroot/cello/kt-opengl In directory clnet:/tmp/cvs-serv8357/kt-opengl
Modified Files: colors.lisp kt-opengl.lisp kt-opengl.lpr ogl-utils.lisp Log Message:
--- /project/cello/cvsroot/cello/kt-opengl/colors.lisp 2006/10/01 09:34:08 1.4 +++ /project/cello/cvsroot/cello/kt-opengl/colors.lisp 2006/10/02 03:55:23 1.5 @@ -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.4 2006/10/01 09:34:08 fgoenninger Exp $ +;;; $Id: colors.lisp,v 1.5 2006/10/02 03:55:23 ktilton Exp $
(in-package #:kt-opengl)
@@ -225,7 +225,7 @@ (define-ogl-rgba-color +GREEN+ 0 255 0 255) (define-ogl-rgba-color +BLUE+ 0 0 255 255)
-(define-ogl-rgba-color +WHITE+ 0 0 0 255) +(define-ogl-rgba-color +WHITE+ 255 255 255 255) (define-ogl-rgba-color +BLACK+ 0 0 0 255) (define-ogl-rgba-color +GRAY+ 128 128 128 255) (define-ogl-rgba-color +TURQUOISE+ 0 255 255 255) @@ -237,6 +237,7 @@ (define-ogl-rgba-color +DK-GRAY+ 64 64 64 255)
(define-ogl-rgba-color +LIGHT-BLUE+ 127 127 255 255) +(define-ogl-rgba-color +YELLOW+ 255 255 127 255) (define-ogl-rgba-color +LIGHT-YELLOW+ 255 255 127 255) (define-ogl-rgba-color +LIGHT-GRAY+ 192 192 192 255) (define-ogl-rgba-color +LT-GRAY+ 192 192 192 255) --- /project/cello/cvsroot/cello/kt-opengl/kt-opengl.lisp 2006/10/01 13:41:30 1.9 +++ /project/cello/cvsroot/cello/kt-opengl/kt-opengl.lisp 2006/10/02 03:55:23 1.10 @@ -21,7 +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.9 2006/10/01 13:41:30 fgoenninger Exp $ +;;; $Id: kt-opengl.lisp,v 1.10 2006/10/02 03:55:23 ktilton Exp $ + +(pushnew :kt-opengl *features*) +
(in-package :kt-opengl)
@@ -42,12 +45,14 @@ (assert (and opengl-loaded-p glu-loaded-p)) (setf *opengl-dll* t)))))
-(eval-when (:load-toplevel :execute) - (kt-opengl-init)) - (defun kt-opengl-reset () (loop for ec = (glgeterror) for n below 10 when (zerop ec) do (cells::trc "kt-opengl-reset sees zero error code") (loop-finish) do (cells::trc "kt-opengl-init sees error" ec))) + +(eval-when (:load-toplevel :execute) + (kt-opengl-init)) + + --- /project/cello/cvsroot/cello/kt-opengl/kt-opengl.lpr 2006/08/28 21:45:28 1.5 +++ /project/cello/cvsroot/cello/kt-opengl/kt-opengl.lpr 2006/10/02 03:55:23 1.6 @@ -5,14 +5,17 @@ (defpackage :KT-OPENGL)
(define-project :name :kt-opengl - :modules (list (make-instance 'module :name "kt-opengl.lisp") + :modules (list (make-instance 'module :name "defpackage.lisp") + (make-instance 'module :name "kt-opengl-config.lisp") + (make-instance 'module :name "kt-opengl.lisp") (make-instance 'module :name "gl-def.lisp") (make-instance 'module :name "gl-constants.lisp") (make-instance 'module :name "gl-functions.lisp") (make-instance 'module :name "glu-functions.lisp") (make-instance 'module :name "ogl-macros.lisp") (make-instance 'module :name "ogl-utils.lisp") - (make-instance 'module :name "move-to-gl.lisp")) + (make-instance 'module :name "move-to-gl.lisp") + (make-instance 'module :name "colors.lisp")) :projects (list (make-instance 'project-module :name "..\cffi-extender\cffi-extender")) :libraries nil --- /project/cello/cvsroot/cello/kt-opengl/ogl-utils.lisp 2006/10/01 20:44:22 1.8 +++ /project/cello/cvsroot/cello/kt-opengl/ogl-utils.lisp 2006/10/02 03:55:23 1.9 @@ -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.8 2006/10/01 20:44:22 fgoenninger Exp $ +;;; $Id: ogl-utils.lisp,v 1.9 2006/10/02 03:55:23 ktilton Exp $
(declaim (optimize (debug 1) (speed 3) (safety 1) (compilation-speed 0)))
@@ -179,9 +179,9 @@
(defun ncalc-normalf(v0x v0y v0z v1x v1y v1z v2x v2y v2z &aux d0x d0y d0z d1x d1y d1z) - (declare (type GLfloat - v0x v0y v0z v1x v1y v1z v2x v2y v2z - d0x d0y d0z d1x d1y d1z)) +;;; (declare (type GLfloat +;;; v0x v0y v0z v1x v1y v1z v2x v2y v2z +;;; d0x d0y d0z d1x d1y d1z))
(setf d0x (- v1x v0x) d0y (- v1y v0y) @@ -197,7 +197,7 @@ (- (* d0x d1y) (* d0y d1x))))
(defun xgl-normalize-v3f (x y z) - (declare (type GLfloat x y z)) +;;; (declare (type GLfloat x y z))
(let ((m2 (+ (* x x) (* y y) (* z z)))) (if (zerop m2)
-
ktilton