[cello-cvs] CVS cello/cellodemo

[ktilton]

Update of /project/cello/cvsroot/cello/cellodemo
In directory clnet:/tmp/cvs-serv22618/cellodemo

Modified Files:
	cellodemo.lisp cellodemo.lpr demo-window.lisp light-panel.lisp 
Log Message:
CVS re-organization bringing auxiliary packages under one Cello module

--- /project/cello/cvsroot/cello/cellodemo/cellodemo.lisp	2005/07/05 17:00:29	1.1
+++ /project/cello/cvsroot/cello/cellodemo/cellodemo.lisp	2006/05/17 16:14:28	1.2
@@ -23,7 +23,7 @@
 (in-package :cello)
 
 
-#+test
+#+(or)
 (list
  (demo-image-subdir "shapers")
  (demo-image-subdir))
--- /project/cello/cvsroot/cello/cellodemo/cellodemo.lpr	2005/07/05 17:00:29	1.1
+++ /project/cello/cvsroot/cello/cellodemo/cellodemo.lpr	2006/05/17 16:14:28	1.2
@@ -1,4 +1,4 @@
-;; -*- lisp-version: "7.0 [Windows] (May 6, 2005 8:25)"; cg: "1.54.2.17"; -*-
+;; -*- lisp-version: "7.0 [Windows] (Aug 5, 2005 12:23)"; cg: "1.54.2.17"; -*-
 
 (in-package :cg-user)
 
--- /project/cello/cvsroot/cello/cellodemo/demo-window.lisp	2005/07/05 17:00:29	1.1
+++ /project/cello/cvsroot/cello/cellodemo/demo-window.lisp	2006/05/17 16:14:28	1.2
@@ -128,7 +128,7 @@
                             :ambient *dusk*
                             :diffuse *dim*
                             :specular *bright*))
-    :recording nil #+not (c? (when (md-value (fm-other :record))
+    :recording nil #+(or) (c? (when (md-value (fm-other :record))
                      (make-recording
                       :wand (magick-wand-template)
                       :splice-wand (magick-wand-template)
@@ -264,6 +264,7 @@
                        (setf (snapshot-release-id .w.)
                          (incf snap-count))))))))
 
+
 (defun texture-picker (&aux (backdrops 
                              (directory
                               (demo-image-subdir "window-bkgs"))))
--- /project/cello/cvsroot/cello/cellodemo/light-panel.lisp	2005/07/05 17:00:29	1.1
+++ /project/cello/cvsroot/cello/cellodemo/light-panel.lisp	2006/05/17 16:14:28	1.2
@@ -203,7 +203,7 @@
 (defmodel ix-light (light ix-stack)
   ((initial-pos :initarg :initial-pos :initform nil :accessor initial-pos))
   (:default-initargs
-    :md-value nil #+not (c? (when (md-value (fm-other :enabled))
+    :md-value nil #+(or) (c? (when (md-value (fm-other :enabled))
                     (make-instance 'light
                       :id id)))
     :enabled (c? (md-value (fm-other :enabled)))
@@ -266,4 +266,4 @@
                  (make-rgba-mixer :diffuse))
                (a-stack (:justify :right :visible nil :collapsed t)
                  (alabel "specular")
-                 (make-rgba-mixer :specular))))))
\ No newline at end of file
+                 (make-rgba-mixer :specular))))))