[cello-cvs] CVS cello

ktilton ktilton at common-lisp.net
Thu Jul 6 22:09:10 UTC 2006


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

Modified Files:
	cello-magick.lisp cello-openal.lisp cello.asd cello.lisp 
	cello.lpr colors.lisp ctl-markbox.lisp focus.lisp image.lisp 
	ix-canvas.lisp ix-family.lisp ix-layer-expand.lisp 
	ix-opengl.lisp ix-text.lisp ix-togl.lisp nehe-06.lisp 
Log Message:


--- /project/cello/cvsroot/cello/cello-magick.lisp	2006/06/26 17:05:20	1.4
+++ /project/cello/cvsroot/cello/cello-magick.lisp	2006/07/06 22:09:10	1.5
@@ -16,8 +16,6 @@
 
 (in-package :cello)
 
-(defpackage :cello (:use #:cl-magick))
-
 (eval-when (compile load eval)
   (defmethod ix-layer-expand ((key (eql :wand)) &rest args)
     `(let ((wand ,(car args)))
--- /project/cello/cvsroot/cello/cello-openal.lisp	2006/06/26 17:05:20	1.3
+++ /project/cello/cvsroot/cello/cello-openal.lisp	2006/07/06 22:09:10	1.4
@@ -14,8 +14,6 @@
 
 |#
 
-(defpackage #:cello (:use #:cl-openal))
-
 (in-package :cello)
 
 (defstruct sound paths (gain 1) callback loopingp start (source :default) buffer sources)
--- /project/cello/cvsroot/cello/cello.asd	2006/06/05 01:47:49	1.3
+++ /project/cello/cvsroot/cello/cello.asd	2006/07/06 22:09:10	1.4
@@ -17,48 +17,47 @@
   :description "A Portable Common Lisp GUI"
   :long-description "The final pieces of a portable Common Lisp GUI"
   
-  :depends-on (:cells :gui-geometry :cl-opengl :cl-magick)
-  :components ((:file "cello")
-               (:file "window-macros" :depends-on ("cello"))
-               (:file "clipping" :depends-on ("cello"))
-               (:file "colors" :depends-on ("clipping"))
-               (:file "frame" :depends-on ("colors"))
-               (:file "application" :depends-on ("frame"))
-               (:file "image"
-                 :depends-on ("application"
-                              "window-macros" "clipping"))                
-               (:file "ix-layer-expand" :depends-on ("cello" "image" "frame"))
-               (:file "ix-opengl" :depends-on ("image"))
-               (:file "ix-canvas" :depends-on ("ix-layer-expand"))
-               (:file "ix-family" :depends-on ("cello" "ix-canvas"))
-               (:file "font" :depends-on ("image"))
-               (:file "ix-grid" :depends-on ("ix-inline"))
-               (:file "mouse-click" :depends-on ("ix-grid"))
-               (:file "control" :depends-on ("mouse-click"))
-               (:file "focus" :depends-on ("ix-canvas"))
-               (:file "focus-navigation" :depends-on ("focus"))
-               (:file "focus-utilities" :depends-on ("focus-navigation"))
-               (:file "ix-styled" :depends-on ("ix-canvas" "font"))
-               (:file "ix-text" :depends-on ("ix-styled"))
-               (:file "ix-togl" :depends-on ("ix-text"))
-               (:file "lighting" :depends-on ("ix-inline"))
-               (:file "cello-window" :depends-on ("image" "lighting"))
-               (:file "ctl-toggle" :depends-on ("control" "ix-text"))
-               (:file "ctl-markbox" :depends-on ("ctl-toggle"))
-               (:file "ctl-drag" :depends-on ("ctl-markbox"))
-               (:file "ctl-selectable" :depends-on ("ctl-drag"))
-               (:file "slider" :depends-on ("ctl-selectable"))
-               (:file "window-utilities" :depends-on ("cello-window"))
-               (:file "window-callbacks" :depends-on ("window-utilities"))
-               (:file "wm-mouse" :depends-on ("window-callbacks"))
-               (:file "pick" :depends-on ("wm-mouse"))
-               (:file "ix-render" :depends-on ("pick"))
-               (:file "ix-polygon" :depends-on ("ix-render"))
-               (:file "cello-ftgl")
-               (:file "cello-openal")
-               (:file "cello-magick" :depends-on ("cello-ftgl"))
-               (:file "nehe-06" :depends-on ("cello-magick"))
-               ))
+  :depends-on (:cells :gui-geometry :kt-opengl :cffi-extender :cl-magick
+               :celtk :cl-openal)
+  :serial t
+  :components
+  ((:file "cello")
+   (:file "window-macros")
+   (:file "clipping")
+   (:file "colors")
+   (:file "ix-layer-expand")
+   (:file "frame")
+   (:file "application")
+   (:file "image")
+   (:file "ix-opengl")
+   (:file "ix-canvas")
+   (:file "ix-family")
+   (:file "font")
+   (:file "ix-grid")
+   (:file "mouse-click")
+   (:file "control") 
+   (:file "focus")
+   (:file "focus-navigation")
+   (:file "focus-utilities")
+   (:file "ix-styled")
+   (:file "ix-text")
+   (:file "ix-togl")
+   (:file "lighting")
+   (:file "ctl-toggle")
+   (:file "ctl-markbox")
+   (:file "ctl-drag")
+   (:file "ctl-selectable")
+   (:file "slider")
+   (:file "cello-window")
+   (:file "window-utilities")
+   (:file "wm-mouse")
+   (:file "pick")
+   (:file "ix-paint")
+   (:file "ix-polygon")
+   (:file "cello-ftgl")
+   (:file "cello-magick")
+   (:file "cello-openal")
+   (:file "nehe-06")))
 
 
 
--- /project/cello/cvsroot/cello/cello.lisp	2006/06/26 17:05:20	1.6
+++ /project/cello/cvsroot/cello/cello.lisp	2006/07/06 22:09:10	1.7
@@ -18,7 +18,7 @@
   (:nicknames :clo)
   (:use
    #:common-lisp
-   #-(or ccl cormanlisp) #:clos
+   #-(or ccl cormanlisp sbcl) #:clos
    #:utils-kt
    #:cells
    #:gui-geometry
@@ -41,4 +41,4 @@
   ()
   (:default-initargs
       :ll 0 :lt 0 :lr (u96ths 48)
-    :lb (u96ths 24)))
\ No newline at end of file
+    :lb (u96ths 24)))
--- /project/cello/cvsroot/cello/cello.lpr	2006/07/03 00:35:12	1.8
+++ /project/cello/cvsroot/cello/cello.lpr	2006/07/06 22:09:10	1.9
@@ -1,4 +1,4 @@
-;; -*- lisp-version: "8.0 [Windows] (Jun 28, 2006 10:53)"; cg: "1.81"; -*-
+;; -*- lisp-version: "8.0 [Windows] (Jul 5, 2006 12:21)"; cg: "1.81"; -*-
 
 (in-package :cg-user)
 
--- /project/cello/cvsroot/cello/colors.lisp	2006/06/05 01:47:49	1.3
+++ /project/cello/cvsroot/cello/colors.lisp	2006/07/06 22:09:10	1.4
@@ -70,7 +70,7 @@
    (cffi:mem-aref co :float 2)
    (cffi:mem-aref co :float 3)))
 
-(eval-when (compile load execute)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (export '(+white+ +red+ +dark-green+ +green+ +turqoise+ +dk-blue+
              +blue+ +lt-blue+ +black+ +yellow+ +lt-yellow+
              +purple+ +gray+ +lt-gray+ +dk-gray+)))
--- /project/cello/cvsroot/cello/ctl-markbox.lisp	2006/06/26 17:05:20	1.5
+++ /project/cello/cvsroot/cello/ctl-markbox.lisp	2006/07/06 22:09:10	1.6
@@ -18,7 +18,7 @@
 
 (defparameter *mark-box-size* (u96ths 9))
 
-(eval-when (compile load eval)
+(eval-now!
   (defmethod ix-layer-expand ((self (eql :x-mark)) &rest args)
     `(ix-render-x-mark ,(car args) l-box)))
 
--- /project/cello/cvsroot/cello/focus.lisp	2006/06/26 17:05:20	1.3
+++ /project/cello/cvsroot/cello/focus.lisp	2006/07/06 22:09:10	1.4
@@ -34,7 +34,7 @@
 it without it being a kid there
 
 |#
-(eval-when (compile load eval)
+(eval-now!
   (export '(^focus focus)))
 
 (defmodel focuser (ix-canvas)
--- /project/cello/cvsroot/cello/image.lisp	2006/07/03 00:35:12	1.8
+++ /project/cello/cvsroot/cello/image.lisp	2006/07/06 22:09:10	1.9
@@ -147,6 +147,10 @@
 (defmethod path ((self ix-view))
   (path (fm-parent self)))
 
+(defgeneric ogl-dsp-list-prep (self)
+  (:method-combination progn)
+  (:documentation "Do stuff needed before render but not needed/wanted in display list"))
+
 (defmethod ogl-dsp-list-prep progn ((self ix-view))
   (ogl-dsp-list-prep (skin self)))
 
--- /project/cello/cvsroot/cello/ix-canvas.lisp	2006/06/05 01:47:49	1.3
+++ /project/cello/cvsroot/cello/ix-canvas.lisp	2006/07/06 22:09:10	1.4
@@ -156,7 +156,7 @@
                                          (target-res self)
                                          (cs-logical-screen-resolution))))
 
-(eval-when (compile load eval)
+(eval-now!
   (export '(ix-canvas target-res)))
 
 
--- /project/cello/cvsroot/cello/ix-family.lisp	2006/06/05 01:47:49	1.3
+++ /project/cello/cvsroot/cello/ix-family.lisp	2006/07/06 22:09:10	1.4
@@ -16,7 +16,7 @@
 
 (in-package :cello)
 
-(eval-when (compile load eval)
+(eval-now!
   (export '(a-stack a-row)))
 
 
--- /project/cello/cvsroot/cello/ix-layer-expand.lisp	2006/06/11 13:32:24	1.5
+++ /project/cello/cvsroot/cello/ix-layer-expand.lisp	2006/07/06 22:09:10	1.6
@@ -253,8 +253,8 @@
             ;;for dbg = (and (eql dx 1)(eql dy 1)(not no-turn-p))
             do (destructuring-bind (xyn0 ix0 iy0 ox0 oy0) 
                    (cons (+ (if oc (/ theta 2) 0)
-                           (case dx (1 (case dy (1 0)(-1 (/ pi -2))))
-                             (-1 (case dy (1 (/ pi 2))(-1 pi)))))
+                           (ecase dx (1 (ecase dy (1 0)(-1 (/ pi -2))))
+                             (-1 (ecase dy (1 (/ pi 2))(-1 pi)))))
                      (if oc
                          (case (* dx dy)
                            (1 (list (* dx ix)(* dy by)(* dx ox)(* dy by)))
--- /project/cello/cvsroot/cello/ix-opengl.lisp	2006/07/03 00:35:12	1.2
+++ /project/cello/cvsroot/cello/ix-opengl.lisp	2006/07/06 22:09:10	1.3
@@ -17,10 +17,6 @@
 
 (in-package :cello)
 
-(defgeneric ogl-dsp-list-prep (self)
-  (:method-combination progn)
-  (:documentation "Do stuff needed before render but not needed/wanted in display list"))
-
 (defmethod ogl-dsp-list-prep progn (self)
   (declare (ignore self))
   (assert (not *ogl-listing-p*)))
--- /project/cello/cvsroot/cello/ix-text.lisp	2006/07/03 00:35:12	1.7
+++ /project/cello/cvsroot/cello/ix-text.lisp	2006/07/06 22:09:10	1.8
@@ -58,7 +58,8 @@
    (lr :initform (c? (^lr-width (+ (cond
                                     ((char-mask self) (ix-string-width self (char-mask self)))
                                     ((^text-width))
-                                    ((ix-string-width self (char-mask self))))
+                                    ((^maxcharwidth))
+                                    (t (error "Please specify a font or :lr <n>.")))
                                   (* 2 (inset-h self))))))
    (lb :initform (c? (downs 0 (font-descent (text-font self)) (inset-v self))))
    )
--- /project/cello/cvsroot/cello/ix-togl.lisp	2006/07/03 00:35:12	1.2
+++ /project/cello/cvsroot/cello/ix-togl.lisp	2006/07/06 22:09:10	1.3
@@ -16,7 +16,7 @@
 
 (in-package :cello)
 
-(eval-when (compile load eval)
+(eval-now!
   (export '(ix-togl-event-handler)))
 
 ;------------- Window ---------------
--- /project/cello/cvsroot/cello/nehe-06.lisp	2006/07/03 00:35:12	1.6
+++ /project/cello/cvsroot/cello/nehe-06.lisp	2006/07/06 22:09:10	1.7
@@ -171,7 +171,7 @@
   (setf *skin6* (mgk:wand-ensure-typed 'wand-texture
                   (test-image "jmcbw512" "jpg")))
   (setf *grace* (mgk:wand-ensure-typed 'wand-pixels
-                  (test-image "grace" "jpg")))) ; "turing" "gif"))))
+                  (test-image "graceblue" "jpg")))) ; "turing" "gif"))))
 
 (defun print-frame-rate (window)
   (with-slots (frame-count t0) window




More information about the Cello-cvs mailing list