Update of /project/cello/cvsroot/cello In directory clnet:/tmp/cvs-serv25558
Modified Files: cello.lpr colors.lisp ix-layer-expand.lisp nehe-06.lisp Log Message:
--- /project/cello/cvsroot/cello/cello.lpr 2006/07/06 22:09:10 1.9 +++ /project/cello/cvsroot/cello/cello.lpr 2006/07/24 05:00:35 1.10 @@ -1,4 +1,4 @@ -;; -*- lisp-version: "8.0 [Windows] (Jul 5, 2006 12:21)"; cg: "1.81"; -*- +;; -*- lisp-version: "8.0 [Windows] (Jul 11, 2006 4:27)"; cg: "1.81"; -*-
(in-package :cg-user)
--- /project/cello/cvsroot/cello/colors.lisp 2006/07/06 22:09:10 1.4 +++ /project/cello/cvsroot/cello/colors.lisp 2006/07/24 05:00:35 1.5 @@ -71,7 +71,7 @@ (cffi:mem-aref co :float 3)))
(eval-when (:compile-toplevel :load-toplevel :execute) - (export '(+white+ +red+ +dark-green+ +green+ +turqoise+ +dk-blue+ + (export '(+white+ +red+ +dark-green+ +green+ +turquoise+ +dk-blue+ +blue+ +lt-blue+ +black+ +yellow+ +lt-yellow+ +purple+ +gray+ +lt-gray+ +dk-gray+)))
@@ -79,7 +79,7 @@ (defparameter +red+ (mk-rgba 255 0 0 255)) (defparameter +dark-green+ (mk-rgba 0 128 0 255)) (defparameter +green+ (mk-rgba 0 255 0 255)) -(defparameter +turqoise+ (mk-rgba 0 255 255 255)) +(defparameter +turquoise+ (mk-rgba 0 255 255 255)) (defparameter +dk-blue+ (mk-rgba 0 0 64 50)) (defparameter +blue+ (mk-rgba 0 0 255 255)) (defparameter +lt-blue+ (mk-rgba 127 127 255 255)) --- /project/cello/cvsroot/cello/ix-layer-expand.lisp 2006/07/06 22:09:10 1.6 +++ /project/cello/cvsroot/cello/ix-layer-expand.lisp 2006/07/24 05:00:35 1.7 @@ -34,7 +34,7 @@ (def-layer-expansion +red+) (def-layer-expansion +dark-green+) (def-layer-expansion +green+) -(def-layer-expansion +turqoise+) +(def-layer-expansion +turquoise+) (def-layer-expansion +dk-blue+) (def-layer-expansion +blue+) (def-layer-expansion +lt-blue+) --- /project/cello/cvsroot/cello/nehe-06.lisp 2006/07/06 22:09:10 1.7 +++ /project/cello/cvsroot/cello/nehe-06.lisp 2006/07/24 05:00:35 1.8 @@ -143,7 +143,7 @@ (gl-tex-coord2f 0 1) (v3f -1 1 -1) )) ;;#+ifuwanttoseepixmap - (wand-render *grace* 0 0 1 -1) + ;;(wand-render *grace* 0 0 1 -1)
(progn (gl-scalef 0.006 0.006 0.0)