[cells-cvs] CVS update: cell-cultures/cello/cello-magick.lisp cell-cultures/cello/cello.lpr cell-cultures/cello/image.lisp cell-cultures/cello/window-callbacks.lisp cell-cultures/cello/window.lisp
Kenny Tilton
ktilton at common-lisp.net
Fri May 6 21:18:14 UTC 2005
Update of /project/cells/cvsroot/cell-cultures/cello
In directory common-lisp.net:/tmp/cvs-serv15540/cello
Modified Files:
cello-magick.lisp cello.lpr image.lisp window-callbacks.lisp
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:12 2005
Author: ktilton
Index: cell-cultures/cello/cello-magick.lisp
diff -u cell-cultures/cello/cello-magick.lisp:1.3 cell-cultures/cello/cello-magick.lisp:1.4
--- cell-cultures/cello/cello-magick.lisp:1.3 Fri Oct 15 05:37:21 2004
+++ cell-cultures/cello/cello-magick.lisp Fri May 6 23:18:12 2005
@@ -84,7 +84,7 @@
(defun ix-render-wand (wand l-box)
(if wand
(apply 'wand-render wand (r-bounds l-box))
- (trc "ix-render-wand sees no wand" l-box)))
+ (trc nil "ix-render-wand sees no wand" l-box)))
;;;(defun wand-centered-bounds (wand size)
;;; (let* ((raw-w (magick-get-image-width (^mgk-wand)))
Index: cell-cultures/cello/cello.lpr
diff -u cell-cultures/cello/cello.lpr:1.3 cell-cultures/cello/cello.lpr:1.4
--- cell-cultures/cello/cello.lpr:1.3 Fri Oct 15 05:37:21 2004
+++ cell-cultures/cello/cello.lpr Fri May 6 23:18:12 2005
@@ -1,11 +1,10 @@
-;; -*- lisp-version: "6.2 [Windows] (Sep 3, 2004 12:04)"; common-graphics: "1.389.2.105.2.14"; -*-
+;; -*- lisp-version: "7.0 [Windows] (Apr 6, 2005 17:03)"; cg: "1.54.2.17"; -*-
-(in-package :common-graphics-user)
+(in-package :cg-user)
-(defpackage :cello (:export))
+(defpackage :CELLO)
(define-project :name :cello
- :application-type (intern "Standard EXE" (find-package :keyword))
:modules (list (make-instance 'module :name "cello.lisp")
(make-instance 'module :name "datetime.lisp")
(make-instance 'module :name "window-macros.lisp")
@@ -50,7 +49,7 @@
(make-instance 'module :name "cello-magick.lisp")
(make-instance 'module :name "cello-openal.lisp"))
:projects (list (make-instance 'project-module :name
- "..\\cells\\cells")
+ "c:\\0dev\\cells_2.0\\cells")
(make-instance 'project-module :name
"..\\cl-opengl\\cl-opengl")
(make-instance 'project-module :name
@@ -61,28 +60,20 @@
"..\\cl-openal\\cl-openal"))
:libraries nil
:distributed-files nil
+ :internally-loaded-files nil
:project-package-name :cello
:main-form 'cello::form3
:compilation-unit t
:verbose nil
- :runtime-modules '(:cg :drag-and-drop :lisp-widget
- :multi-picture-button :common-control
- :edit-in-place :outline :grid :group-box
- :header-control :progress-indicator-control
- :common-status-bar :tab-control :trackbar-control
- :up-down-control :dde :mci :carets :hotspots
- :menu-selection :choose-list :directory-list
- :color-dialog :find-dialog :font-dialog
- :string-dialog :yes-no-list-dialog
- :list-view-control :rich-edit :drawable :ole :www
- :aclwin302)
+ :runtime-modules nil
: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
:default-command-line-arguments "+cx +t \"Initializing\""
+ :additional-build-lisp-image-arguments '(:read-init-files nil)
:old-space-size 256000
:new-space-size 6144
:runtime-build-option :standard
Index: cell-cultures/cello/image.lisp
diff -u cell-cultures/cello/image.lisp:1.8 cell-cultures/cello/image.lisp:1.9
--- cell-cultures/cello/image.lisp:1.8 Sun Dec 5 05:49:59 2004
+++ cell-cultures/cello/image.lisp Fri May 6 23:18:12 2005
@@ -65,7 +65,10 @@
(progn
(ogl-dsp-list-prep self)
(when (every 'dsp-list (kids self))
- (let ((display-list-name (or .cache (gl-gen-lists 1)))
+ (let ((display-list-name (or .cache
+ (eko ("new disp list"
+ (mod (get-internal-real-time) 1000))
+ (gl-gen-lists 1))))
(*ogl-shared-resource-tender*
(ogl-shared-resource-tender self)))
(gl-new-list display-list-name gl_compile)
@@ -80,6 +83,10 @@
display-list-name)))))
(gl-name :initarg :gl-name :initform nil :accessor gl-name)
(renderer :initarg :renderer :initform nil :accessor renderer)))
+
+;;;(def-c-output dsp-list ()
+;;; (when old-value
+;;; (gl-delete-lists old-value 1)))
(defmethod not-to-be :after ((self ogl-node))
(bwhen (dl (^dsp-list))
Index: cell-cultures/cello/window-callbacks.lisp
diff -u cell-cultures/cello/window-callbacks.lisp:1.5 cell-cultures/cello/window-callbacks.lisp:1.6
--- cell-cultures/cello/window-callbacks.lisp:1.5 Fri Apr 8 11:11:07 2005
+++ cell-cultures/cello/window-callbacks.lisp Fri May 6 23:18:12 2005
@@ -105,7 +105,7 @@
(trc nil "window-display > rendered w " self (glutgetwindow))
(incf (frame-ct self))
- (when (display-continuous self)
+ #+not (when (display-continuous self)
(trc nil "window-display > continuous specified so posting redisplay" self)
(glut-post-redisplay)))
Index: cell-cultures/cello/window.lisp
diff -u cell-cultures/cello/window.lisp:1.6 cell-cultures/cello/window.lisp:1.7
--- cell-cultures/cello/window.lisp:1.6 Fri Apr 8 11:11:07 2005
+++ cell-cultures/cello/window.lisp Fri May 6 23:18:12 2005
@@ -24,6 +24,8 @@
;------------- Window ---------------
;
+
+
(defmodel window (focuser ix-lit-scene control ogl-shared-resource-tender)
(
(glutw :initarg :glutw :accessor glutw
@@ -415,9 +417,11 @@
((or (c-stopped)
(zerop (glut-get-window))))
;;(format t "before main loop ~a | ~&" (glut-get-window))
- (glutmainloopevent)
+ (progn ;; time
+ (glutmainloopevent))
(setf (tick-count new-window) (os-tickcount))
- (sleep 0.05)))))
+ (sleep 0.05)
+ ))))
(defmethod ix-paint :around ((self window))
(flet ((projection ()
More information about the Cells-cvs
mailing list