[cells-cvs] CVS update: cell-cultures/cello/cello.lisp cell-cultures/cello/cello.lpr cell-cultures/cello/image.lisp cell-cultures/cello/ix-geometry.lisp cell-cultures/cello/pick.lisp cell-cultures/cello/cellocore.lisp

[Kenny Tilton]

Update of /project/cells/cvsroot/cell-cultures/cello
In directory common-lisp.net:/tmp/cvs-serv5472/cello

Modified Files:
	cello.lpr image.lisp ix-geometry.lisp pick.lisp 
Added Files:
	cello.lisp 
Removed Files:
	cellocore.lisp 
Log Message:

Date: Sun Jul  4 11:59:40 2004
Author: ktilton



Index: cell-cultures/cello/cello.lpr
diff -u cell-cultures/cello/cello.lpr:1.1 cell-cultures/cello/cello.lpr:1.2
--- cell-cultures/cello/cello.lpr:1.1	Sat Jun 26 11:38:33 2004
+++ cell-cultures/cello/cello.lpr	Sun Jul  4 11:59:40 2004
@@ -4,9 +4,9 @@
 
 (defpackage :cello (:export))
 
-(define-project :name :cellocore
+(define-project :name :cello
   :application-type (intern "Standard EXE" (find-package :keyword))
-  :modules (list (make-instance 'module :name "cellocore.lisp")
+  :modules (list (make-instance 'module :name "cello.lisp")
                  (make-instance 'module :name "datetime.lisp")
                  (make-instance 'module :name "window-macros.lisp")
                  (make-instance 'module :name "clipping.lisp")
@@ -55,11 +55,11 @@
                   (make-instance 'project-module :name
                                  "..\\cl-opengl\\cl-opengl")
                   (make-instance 'project-module :name
-                                 "c:\\dvl\\cl-ftgl\\cl-ftgl")
+                                 "..\\cl-ftgl\\cl-ftgl")
                   (make-instance 'project-module :name
-                                 "c:\\dvl\\cl-magick\\cl-magick")
+                                 "..\\cl-magick\\cl-magick")
                   (make-instance 'project-module :name
-                                 "c:\\dvl\\cl-openal\\cl-openal"))
+                                 "..\\cl-openal\\cl-openal"))
   :libraries nil
   :distributed-files nil
   :project-package-name :cello


Index: cell-cultures/cello/image.lisp
diff -u cell-cultures/cello/image.lisp:1.1 cell-cultures/cello/image.lisp:1.2
--- cell-cultures/cello/image.lisp:1.1	Sat Jun 26 11:38:33 2004
+++ cell-cultures/cello/image.lisp	Sun Jul  4 11:59:40 2004
@@ -32,9 +32,8 @@
 
 (defmethod ogl-dsp-list-prep progn (self)
   (declare (ignore self))
-  (assert (not *listingp*)))
+  (assert (not *ogl-listing-p*)))
 
-(defparameter *listingp* nil)
 (defvar *window-rendering*)
 
 (defmodel ogl-node ()
@@ -44,9 +43,9 @@
                    (let ((display-list-name (or .cache (gl-gen-lists 1)))
                          (*window-rendering* (nearest self window)))
                      
-                     (assert (not *listingp*))
+                     (assert (not *ogl-listing-p*))
                      (gl-new-list display-list-name gl_compile)
-                     (let ((*listingp* self)
+                     (let ((*ogl-listing-p* self)
                            *selecting* *render-clip-l* *render-clip-r* *render-clip-t* *render-clip-b*)
                        (with-metrics (nil nil "(funcall renderer)" self)
                          (ix-paint self)))


Index: cell-cultures/cello/ix-geometry.lisp
diff -u cell-cultures/cello/ix-geometry.lisp:1.1 cell-cultures/cello/ix-geometry.lisp:1.2
--- cell-cultures/cello/ix-geometry.lisp:1.1	Sat Jun 26 11:38:33 2004
+++ cell-cultures/cello/ix-geometry.lisp	Sun Jul  4 11:59:40 2004
@@ -308,20 +308,6 @@
        (:center (floor (- (inset-height .parent) (l-height self)) -2))
        (:bottom (- (inset-height .parent) (l-height self))))))
 
-
-
-
-
-
-
-
-
-(defmacro ^as-low-as-parent ()
-     `(inset-lb (fm-parent self)))
-
-(defmacro ^as-right-as-kids ()
-     `(^fm-max-kid pr))
-
 (defmacro ^fill-parent-right (&optional (inset 0))
   `(lr-maintain-pr (- (inset-lr .parent) ,inset)))
 


Index: cell-cultures/cello/pick.lisp
diff -u cell-cultures/cello/pick.lisp:1.1 cell-cultures/cello/pick.lisp:1.2
--- cell-cultures/cello/pick.lisp:1.1	Sat Jun 26 11:38:33 2004
+++ cell-cultures/cello/pick.lisp	Sun Jul  4 11:59:40 2004
@@ -59,7 +59,7 @@
     (glu-perspective 45 aspect 0.1 100.0)) ;;OQ: appropriate for ortho?
   
   (gl-matrix-mode gl_model-view)
-  #+not (let ((*listingp* target)
+  #+not (let ((*ogl-listing-p* target)
         *selecting* *render-clip-l* *render-clip-r* *render-clip-t* *render-clip-b*)
     (with-metrics (nil nil "(funcall renderer)" self)
       (ix-paint target)))