cello-cvs October 2006

cello-cvs@common-lisp.net

2 participants
34 discussions

[cello-cvs] CVS cello/kt-opengl
by fgoenninger 01 Oct '06

01 Oct '06

Update of /project/cello/cvsroot/cello/kt-opengl In directory clnet:/tmp/cvs-serv9289 Added Files: kt-opengl-config.lisp Log Message: Added: CFFI foreign lib definitions. --- /project/cello/cvsroot/cello/kt-opengl/kt-opengl-config.lisp 2006/10/01 12:28:20 NONE +++ /project/cello/cvsroot/cello/kt-opengl/kt-opengl-config.lisp 2006/10/01 12:28:20 1.1 ;; -*- mode: Lisp; Syntax: Common-Lisp; Package: cello; -*- ;;; ;;; Copyright © 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 ;;; in the Software without restriction, including without limitation the rights ;;; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ;;; copies of the Software, and to permit persons to whom the Software is furnished ;;; to do so, subject to the following conditions: ;;; ;;; The above copyright notice and this permission notice shall be included in ;;; all copies or substantial portions of the Software. ;;; ;;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ;;; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ;;; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ;;; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ;;; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ;;; IN THE SOFTWARE. (in-package :kt-opengl) (define-foreign-library OpenGL (:windows (:or "/windows/system32/opengl32.dll")) (:darwin (:or (:framework "OpenGL")))) (define-foreign-library GLU (:windows (:or "/windows/system32/glu32.dll")))

1 0

[cello-cvs] CVS cello/kt-opengl
by fgoenninger 01 Oct '06

01 Oct '06

Update of /project/cello/cvsroot/cello/kt-opengl In directory clnet:/tmp/cvs-serv19248 Removed Files: cl-opengl-config.lisp Log Message: Removed.

1 0

[cello-cvs] CVS cello/kt-opengl
by fgoenninger 01 Oct '06

01 Oct '06

Update of /project/cello/cvsroot/cello/kt-opengl In directory clnet:/tmp/cvs-serv19208 Removed Files: cl-opengl-config-2.lisp Log Message: Removed.

1 0

[cello-cvs] CVS cello/kt-opengl
by fgoenninger 01 Oct '06

01 Oct '06

Update of /project/cello/cvsroot/cello/kt-opengl In directory clnet:/tmp/cvs-serv17675 Modified Files: colors.lisp Log Message: Added: Constant +NO-COLOR-CHANGE+ for macro with-color. --- /project/cello/cvsroot/cello/kt-opengl/colors.lisp 2006/09/19 11:27:07 1.3 +++ /project/cello/cvsroot/cello/kt-opengl/colors.lisp 2006/10/01 09:34:08 1.4 @@ -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.3 2006/09/19 11:27:07 fgoenninger Exp $ +;;; $Id: colors.lisp,v 1.4 2006/10/01 09:34:08 fgoenninger Exp $ (in-package #:kt-opengl) @@ -176,16 +176,18 @@ (defmacro with-color (rgba &body body) (let ((ptr (gensym))) - `(with-foreign-object (,ptr 'glint 4) - (gl-get-integerv GL_CURRENT_COLOR ,ptr) - (unwind-protect - (progn - (set-color ,rgba) - ,@body) - (glcolor4i (mem-aref ,ptr 'glint 0) - (mem-aref ,ptr 'glint 1) - (mem-aref ,ptr 'glint 2) - (mem-aref ,ptr 'glint 3)))))) + `(if ,rgba + (with-foreign-object (,ptr 'glint 4) + (gl-get-integerv GL_CURRENT_COLOR ,ptr) + (unwind-protect + (progn + (set-color ,rgba) + ,@body) + (glcolor4i (mem-aref ,ptr 'glint 0) + (mem-aref ,ptr 'glint 1) + (mem-aref ,ptr 'glint 2) + (mem-aref ,ptr 'glint 3)))) + ,@body))) ;;; --------------------------------------------------------------------------- ;;; EXPORT SYMBOLS @@ -207,12 +209,16 @@ make-opengl-rgba rgba-clear-color *known-colors* + +NO-COLOR-CHANGE+ ) ;;; =========================================================================== ;;; Color definitions ;;; =========================================================================== +(defconstant +NO-COLOR-CHANGE+ nil + "Macro WITH-COLOR uses NIL as a discriminator for determining when to not change color but just to execute the body") + ;;; RGBA simple colors (define-ogl-rgba-color +RED+ 255 0 0 255)

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

cello-cvs October 2006