[cells-cvs] CVS update: cell-cultures/cellodemo/cellodemo.lisp cell-cultures/cellodemo/cellodemo.lpr cell-cultures/cellodemo/demo-window.lisp
Kenny Tilton
ktilton at common-lisp.net
Fri May 6 21:18:16 UTC 2005
Update of /project/cells/cvsroot/cell-cultures/cellodemo
In directory common-lisp.net:/tmp/cvs-serv15540/cellodemo
Modified Files:
cellodemo.lisp cellodemo.lpr demo-window.lisp
Log Message:
Establish Cells II (aka Cells 2.0, aka Cells) as Cells module in Cells project CVS tree
Date: Fri May 6 23:18:14 2005
Author: ktilton
Index: cell-cultures/cellodemo/cellodemo.lisp
diff -u cell-cultures/cellodemo/cellodemo.lisp:1.4 cell-cultures/cellodemo/cellodemo.lisp:1.5
--- cell-cultures/cellodemo/cellodemo.lisp:1.4 Thu Oct 28 02:09:03 2004
+++ cell-cultures/cellodemo/cellodemo.lisp Fri May 6 23:18:14 2005
@@ -22,9 +22,16 @@
(in-package :cello)
-(defun demo-image-subdir (subdir)
- (merge-pathnames (make-pathname :directory `(:relative ,(string subdir)))
- cl-user::*cell-cultures-graphics-directory*))
+
+#+test
+(list
+ (demo-image-subdir "shapers")
+ (demo-image-subdir))
+
+(defun demo-image-subdir (&optional subdir)
+ (make-pathname :directory
+ (append '(:absolute "cell-cultures" "cell-cultures-user" "graphics")
+ (when subdir (list subdir)))))
(defun demo-image-file (subdir file)
(merge-pathnames file
Index: cell-cultures/cellodemo/cellodemo.lpr
diff -u cell-cultures/cellodemo/cellodemo.lpr:1.5 cell-cultures/cellodemo/cellodemo.lpr:1.6
--- cell-cultures/cellodemo/cellodemo.lpr:1.5 Fri Apr 8 11:11:08 2005
+++ cell-cultures/cellodemo/cellodemo.lpr Fri May 6 23:18:14 2005
@@ -1,4 +1,4 @@
-;; -*- lisp-version: "7.0 [Windows] (Dec 28, 2004 17:34)"; cg: "1.54.2.17"; -*-
+;; -*- lisp-version: "7.0 [Windows] (Apr 6, 2005 17:03)"; cg: "1.54.2.17"; -*-
(in-package :cg-user)
@@ -21,58 +21,10 @@
:main-form nil
:compilation-unit t
:verbose nil
- :runtime-modules '(:cg-dde-utils :cg.base :cg.bitmap-pane
- :cg.bitmap-pane.clipboard :cg.bitmap-stream
- :cg.button :cg.caret :cg.check-box :cg.choice-list
- :cg.choose-printer :cg.clipboard
- :cg.clipboard-stack :cg.clipboard.pixmap
- :cg.color-dialog :cg.combo-box :cg.common-control
- :cg.comtab :cg.cursor-pixmap :cg.curve
- :cg.dialog-item :cg.directory-dialog
- :cg.directory-dialog-os :cg.drag-and-drop
- :cg.drag-and-drop-image :cg.drawable
- :cg.drawable.clipboard :cg.dropping-outline
- :cg.edit-in-place :cg.editable-text
- :cg.file-dialog :cg.fill-texture
- :cg.find-string-dialog :cg.font-dialog
- :cg.gesture-emulation :cg.get-pixmap
- :cg.get-position :cg.graphics-context
- :cg.grid-widget :cg.grid-widget.drag-and-drop
- :cg.group-box :cg.header-control :cg.hotspot
- :cg.icon :cg.icon-pixmap :cg.item-list
- :cg.keyboard-shortcuts :cg.lettered-menu
- :cg.lisp-edit-pane :cg.lisp-text :cg.lisp-widget
- :cg.list-view :cg.mci :cg.menu :cg.menu.tooltip
- :cg.message-dialog :cg.multi-line-editable-text
- :cg.multi-line-lisp-text :cg.multi-picture-button
- :cg.multi-picture-button.drag-and-drop
- :cg.multi-picture-button.tooltip :cg.os-widget
- :cg.os-window :cg.outline
- :cg.outline.drag-and-drop
- :cg.outline.edit-in-place :cg.palette
- :cg.paren-matching :cg.picture-widget
- :cg.picture-widget.palette :cg.pixmap
- :cg.pixmap-widget :cg.pixmap.file-io
- :cg.pixmap.printing :cg.pixmap.rotate :cg.printing
- :cg.progress-indicator :cg.project-window
- :cg.property :cg.radio-button :cg.rich-edit
- :cg.rich-edit-pane :cg.rich-edit-pane.clipboard
- :cg.rich-edit-pane.printing :cg.sample-file-menu
- :cg.scaling-stream :cg.scroll-bar
- :cg.scroll-bar-mixin :cg.selected-object
- :cg.shortcut-menu :cg.static-text :cg.status-bar
- :cg.string-dialog :cg.tab-control
- :cg.template-string :cg.text-edit-pane
- :cg.text-edit-pane.file-io :cg.text-edit-pane.mark
- :cg.text-or-combo :cg.text-widget :cg.timer
- :cg.toggling-widget :cg.toolbar :cg.tooltip
- :cg.trackbar :cg.tray :cg.up-down-control
- :cg.utility-dialog :cg.web-browser
- :cg.web-browser.dde :cg.wrap-string
- :cg.yes-no-list :cg.yes-no-string :dde)
+ :runtime-modules '(:cg-dde-utils :cg.base)
:splash-file-module (make-instance 'build-module :name "")
:icon-file-module (make-instance 'build-module :name "")
- :include-flags '(:compiler :top-level :local-name-info)
+ :include-flags '(:local-name-info)
:build-flags '(:allow-debug :purify)
:autoload-warning t
:full-recompile-for-runtime-conditionalizations nil
Index: cell-cultures/cellodemo/demo-window.lisp
diff -u cell-cultures/cellodemo/demo-window.lisp:1.6 cell-cultures/cellodemo/demo-window.lisp:1.7
--- cell-cultures/cellodemo/demo-window.lisp:1.6 Thu Oct 28 02:09:03 2004
+++ cell-cultures/cellodemo/demo-window.lisp Fri May 6 23:18:14 2005
@@ -45,7 +45,7 @@
(make-pathname
:name "brushdmtl"
:type "jpg")
- cl-user::*cell-cultures-graphics-directory*)))
+ (demo-image-subdir))))
:pre-layer (c? (let ((tx-name (texture-name (^skin)))
(tx-size (image-size (^skin))))
(with-layers :on +white+
@@ -72,17 +72,15 @@
(defun run-demos (demo-names start-at &rest iargs)
(declare (ignorable start-at))
(run-window (apply 'make-instance 'demo-window
- :md-value (c-in (list start-at))
- ;:idler 'mg-glut-idle
- :content demo-names
- iargs)
+ :md-value (c-in (list start-at))
+ ;:idler 'mg-glut-idle
+ :content demo-names
+ iargs)
(lambda ()
;;; -- not sure how much of this new reset stuff is necessary ---
(cl-ftgl-reset)
(cl-ftgl-init)
- (wands-clear)
- ;; (ogl::xfg)
- )))
+ (wands-clear))))
(defun run-stylish-demos (demo-names start-at &rest iargs)
(with-styles (
@@ -148,12 +146,11 @@
(list (md-value lm))))
:snapshot-pathnamer (lambda (self)
- (merge-pathnames
- (make-pathname
- :name (format nil "snap-me-~3,,,'0 at A"
- (snapshot-release-id self))
- :type "jpg")
- cl-user::*cell-cultures-output-directory*))
+ (make-pathname
+ :directory '(:absolute "cell-cultures" "cell-cultures-user" "output")
+ :name (format nil "snap-me-~3,,,'0 at A"
+ (snapshot-release-id self))
+ :type "jpg"))
:pre-layer (c? (with-layers
+white+
More information about the Cells-cvs
mailing list