[cello-cvs] CVS cello/kt-opengl

[ktilton]

Update of /project/cello/cvsroot/cello/kt-opengl
In directory clnet:/tmp/cvs-serv7403/kt-opengl

Modified Files:
	colors.lisp defpackage.lisp kt-opengl-config.lisp 
	kt-opengl.lisp kt-opengl.lpr ogl-macros.lisp 
Log Message:


--- /project/cello/cvsroot/cello/kt-opengl/colors.lisp	2007/02/02 20:11:17	1.9
+++ /project/cello/cvsroot/cello/kt-opengl/colors.lisp	2008/04/11 09:23:07	1.10
@@ -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.9 2007/02/02 20:11:17 ktilton Exp $
+;;; $Id: colors.lisp,v 1.10 2008/04/11 09:23:07 ktilton Exp $
 
 (in-package #:kt-opengl)
 
@@ -251,6 +251,7 @@
 
 (define-ogl-rgba-color +orange+                       192 192 192 255)
 (define-ogl-rgba-color +saddle-brown+ 139 69 19 255)
+(define-ogl-rgba-color +brown+ 139 69 19 255)
 
 ;;; PANTONE colors as defined by graphics design s/w Art Director's Toolkit V.5
 
--- /project/cello/cvsroot/cello/kt-opengl/defpackage.lisp	2007/02/02 20:11:18	1.3
+++ /project/cello/cvsroot/cello/kt-opengl/defpackage.lisp	2008/04/11 09:23:07	1.4
@@ -20,13 +20,13 @@
 ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 
 ;;; IN THE SOFTWARE.
 
-;;; $Id: defpackage.lisp,v 1.3 2007/02/02 20:11:18 ktilton Exp $
+;;; $Id: defpackage.lisp,v 1.4 2008/04/11 09:23:07 ktilton Exp $
 
 (pushnew :kt-opengl *features*)
 
 (defpackage #:kt-opengl
   (:nicknames #:ogl)
-  (:use #:common-lisp #:cffi #:ffx)
+  (:use #:common-lisp #:cffi #:ffx #:utils-kt)
   (:export
 
     #:kt-opengl-init
@@ -78,6 +78,7 @@
     #:v3f-y
     #:v3f-z
     #:mkv3f
+   #:mk-rgba
 
     #:v3d
     #:make-v3d
--- /project/cello/cvsroot/cello/kt-opengl/kt-opengl-config.lisp	2007/02/02 20:11:19	1.2
+++ /project/cello/cvsroot/cello/kt-opengl/kt-opengl-config.lisp	2008/04/11 09:23:07	1.3
@@ -23,8 +23,8 @@
 (in-package :kt-opengl)
 
 (define-foreign-library OpenGL
-  (:windows (:or "/windows/system32/opengl32.dll"))
+    (:windows (:or "opengl32.dll"))
   (:darwin (:or (:framework "OpenGL"))))
 
 (define-foreign-library GLU
-  (:windows (:or "/windows/system32/glu32.dll")))
+    (:windows (:or "glu32.dll")))
--- /project/cello/cvsroot/cello/kt-opengl/kt-opengl.lisp	2007/02/02 20:11:19	1.12
+++ /project/cello/cvsroot/cello/kt-opengl/kt-opengl.lisp	2008/04/11 09:23:07	1.13
@@ -21,7 +21,7 @@
 ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 
 ;;; IN THE SOFTWARE.
 
-;;; $Id: kt-opengl.lisp,v 1.12 2007/02/02 20:11:19 ktilton Exp $
+;;; $Id: kt-opengl.lisp,v 1.13 2008/04/11 09:23:07 ktilton Exp $
 
 (pushnew :kt-opengl *features*)
 
@@ -50,6 +50,7 @@
         when (zerop ec) do (loop-finish)
         do (cells::trc "kt-opengl-init sees error" ec)))
 
+;; this breaks build of distro since that builds dll path differently
 (eval-when (:load-toplevel :execute)
   (kt-opengl-init))
 
--- /project/cello/cvsroot/cello/kt-opengl/kt-opengl.lpr	2007/02/02 20:11:19	1.9
+++ /project/cello/cvsroot/cello/kt-opengl/kt-opengl.lpr	2008/04/11 09:23:07	1.10
@@ -1,4 +1,4 @@
-;; -*- lisp-version: "8.0 [Windows] (Jan 22, 2007 8:01)"; cg: "1.81"; -*-
+;; -*- lisp-version: "8.0 [Windows] (Jan 29, 2007 18:02)"; cg: "1.81"; -*-
 
 (in-package :cg-user)
 
--- /project/cello/cvsroot/cello/kt-opengl/ogl-macros.lisp	2007/02/02 20:11:19	1.11
+++ /project/cello/cvsroot/cello/kt-opengl/ogl-macros.lisp	2008/04/11 09:23:07	1.12
@@ -129,6 +129,7 @@
          (gl-translatef (- ,dx)(- ,dy)(- ,dz))))))
 
 (defun glec (&optional (id :anon) announce-success)
+  #-its-alive! 
   (if (and (boundp '*gl-begun*) *gl-begun*)
       (progn (cells:trc nil "not checking error inside gl.begin" id))
     (let ((e (glgeterror)))
@@ -141,7 +142,7 @@
               (progn
                 (setf *gl-stop* t)
                 (format t "~&~%OGL error ~a at ID ~a" e id)
-                (break "OGL error ~a at ID ~a" e id)
+                ;(break "OGL error ~a at ID ~a" e id)
                 ))
           #+sigh (print `("OGL error ~a at ID ~a" ,e ,id)))))))