- cells-cvs@common-lisp.net - mailman3.common-lisp.net

[cells-cvs] CVS update: cells/utils-kt/debug.lisp cells/utils-kt/defpackage.lisp cells/utils-kt/detritus.lisp cells/utils-kt/flow-control.lisp cells/utils-kt/quad.lisp cells/utils-kt/strings.lisp cells/utils-kt/utils-kt.asd cells/utils-kt/utils-kt.lpr
by ktilton＠common-lisp.net 06 May '05

06 May '05

Update of /project/cells/cvsroot/cells/utils-kt In directory common-lisp.net:/tmp/cvs-serv10533/utils-kt Added Files: debug.lisp defpackage.lisp detritus.lisp flow-control.lisp quad.lisp strings.lisp utils-kt.asd utils-kt.lpr Log Message: Establish Cells II (aka Cells 2.0, aka Cells) as Cells module in Cells project CVS tree Date: Fri May 6 22:27:48 2005 Author: ktilton

1 0

[cells-cvs] CVS update: cells/README.txt cells/asdf.lisp cells/cell-types.lisp cells/cells-test.asd cells/cells.asd cells/cells.lisp cells/cells.lpr cells/constructors.lisp cells/defmodel.lisp cells/defpackage.lisp cells/family-values.lisp cells/family.lisp cells/fm-utilities.lisp cells/initialize.lisp cells/integrity.lisp cells/link.lisp cells/load.lisp cells/md-slot-value.lisp cells/md-utilities.lisp cells/model-object.lisp cells/optimization.lisp cells/propagate.lisp cells/slot-utilities.lisp cells/synap
by ktilton＠common-lisp.net 06 May '05

06 May '05

Update of /project/cells/cvsroot/cells In directory common-lisp.net:/tmp/cvs-serv10393 Added Files: README.txt asdf.lisp cell-types.lisp cells-test.asd cells.asd cells.lisp cells.lpr constructors.lisp defmodel.lisp defpackage.lisp family-values.lisp family.lisp fm-utilities.lisp initialize.lisp integrity.lisp link.lisp load.lisp md-slot-value.lisp md-utilities.lisp model-object.lisp optimization.lisp propagate.lisp slot-utilities.lisp synapse-types.lisp synapse.lisp test.lisp Log Message: Establish Cells II (aka Cells 2.0, aka Cells) as Cells module in Cells project CVS tree Date: Fri May 6 22:25:39 2005 Author: ktilton

1 0

[cells-cvs] CVS update: Directory change: cells/utils-kt
by ktilton＠common-lisp.net 06 May '05

06 May '05

Update of /project/cells/cvsroot/cells/utils-kt In directory common-lisp.net:/tmp/cvs-serv10096/utils-kt Log Message: Directory /project/cells/cvsroot/cells/utils-kt added to the repository Date: Fri May 6 22:17:32 2005 Author: ktilton New directory cells/utils-kt added

1 0

[cells-cvs] CVS update: Module imported: cells
by ktilton＠common-lisp.net 06 May '05

06 May '05

Update of /project/cells/cvsroot/cells In directory common-lisp.net:/tmp/cvs-serv9095 Log Message: Status: Vendor Tag: tcvs-vendor Release Tags: tcvs-release No conflicts created by this import Date: Fri May 6 22:13:14 2005 Author: ktilton New module cells added

1 0

[cells-cvs] CVS update: cell-cultures/ffi-extender/arrays.lisp cell-cultures/ffi-extender/callbacks.lisp cell-cultures/ffi-extender/definers.lisp cell-cultures/ffi-extender/ffi-extender.asd cell-cultures/ffi-extender/ffi-extender.lpr
by ktilton＠common-lisp.net 08 Apr '05

08 Apr '05

Update of /project/cells/cvsroot/cell-cultures/ffi-extender In directory common-lisp.net:/tmp/cvs-serv12564/ffi-extender Removed Files: arrays.lisp callbacks.lisp definers.lisp ffi-extender.asd ffi-extender.lpr Log Message: Cello cleanup, but mostly "removing" ffi-extender, which really lives on as the "hello-c" package Date: Fri Apr 8 11:11:31 2005 Author: ktilton

1 0

[cells-cvs] CVS update: cell-cultures/utils-kt/utils-kt.lpr
by ktilton＠common-lisp.net 08 Apr '05

08 Apr '05

Update of /project/cells/cvsroot/cell-cultures/utils-kt In directory common-lisp.net:/tmp/cvs-serv12564/utils-kt Modified Files: utils-kt.lpr Log Message: Cello cleanup, but mostly "removing" ffi-extender, which really lives on as the "hello-c" package Date: Fri Apr 8 11:11:30 2005 Author: ktilton Index: cell-cultures/utils-kt/utils-kt.lpr diff -u cell-cultures/utils-kt/utils-kt.lpr:1.2 cell-cultures/utils-kt/utils-kt.lpr:1.3 --- cell-cultures/utils-kt/utils-kt.lpr:1.2 Tue Jun 29 10:58:49 2004 +++ cell-cultures/utils-kt/utils-kt.lpr Fri Apr 8 11:11:21 2005 @@ -1,9 +1,15 @@ -;; -*- lisp-version: "6.2 [Windows] (May 12, 2004 22:13)"; common-graphics: "1.389.2.105.2.14"; -*- +;; -*- lisp-version: "7.0 [Windows] (Dec 28, 2004 17:34)"; cg: "1.54.2.17"; -*- -(in-package :common-graphics-user) +(in-package :cg-user) + +(defpackage :COMMON-LISP + (:export #:list + #:make-instance + #:t + #:nil + #:quote)) (define-project :name :utils-kt - :application-type (intern "Standard EXE" (find-package :keyword)) :modules (list (make-instance 'module :name "defpackage.lisp") (make-instance 'module :name "debug.lisp") (make-instance 'module :name "detritus.lisp") @@ -12,28 +18,20 @@ :projects nil :libraries nil :distributed-files nil + :internally-loaded-files nil :project-package-name :common-lisp :main-form nil :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

1 0

[cells-cvs] CVS update: cell-cultures/cl-opengl/cl-opengl.lisp cell-cultures/cl-opengl/cl-opengl.lpr cell-cultures/cl-opengl/glut-extras.lisp cell-cultures/cl-opengl/glut-functions.lisp cell-cultures/cl-opengl/nehe-14.lisp cell-cultures/cl-opengl/ogl-macros.lisp cell-cultures/cl-opengl/ogl-utils.lisp
by ktilton＠common-lisp.net 08 Apr '05

08 Apr '05

Update of /project/cells/cvsroot/cell-cultures/cl-opengl In directory common-lisp.net:/tmp/cvs-serv12564/cl-opengl Modified Files: cl-opengl.lisp cl-opengl.lpr glut-extras.lisp glut-functions.lisp nehe-14.lisp ogl-macros.lisp ogl-utils.lisp Log Message: Cello cleanup, but mostly "removing" ffi-extender, which really lives on as the "hello-c" package Date: Fri Apr 8 11:11:19 2005 Author: ktilton Index: cell-cultures/cl-opengl/cl-opengl.lisp diff -u cell-cultures/cl-opengl/cl-opengl.lisp:1.6 cell-cultures/cl-opengl/cl-opengl.lisp:1.7 --- cell-cultures/cl-opengl/cl-opengl.lisp:1.6 Tue Dec 14 04:53:05 2004 +++ cell-cultures/cl-opengl/cl-opengl.lisp Fri Apr 8 11:11:19 2005 @@ -65,14 +65,6 @@ (in-package :cl-opengl) -(defparameter *gl-dynamic-lib* :unconfigured) -(defparameter *glu-dynamic-lib* :unconfigured) -(defparameter *glut-dynamic-lib* :unconfigured) - -(eval-when (compile load) - (load (merge-pathnames "cl-opengl-config" - cl-user::*cell-cultures-config*))) - (defparameter *opengl-dll* nil) (defun gl-boolean-test (value) Index: cell-cultures/cl-opengl/cl-opengl.lpr diff -u cell-cultures/cl-opengl/cl-opengl.lpr:1.2 cell-cultures/cl-opengl/cl-opengl.lpr:1.3 --- cell-cultures/cl-opengl/cl-opengl.lpr:1.2 Tue Dec 14 04:53:05 2004 +++ cell-cultures/cl-opengl/cl-opengl.lpr Fri Apr 8 11:11:19 2005 @@ -1,12 +1,12 @@ -;; -*- 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 :cl-opengl (:export)) +(defpackage :CL-OPENGL) (define-project :name :cl-opengl - :application-type (intern "Standard EXE" (find-package :keyword)) - :modules (list (make-instance 'module :name "cl-opengl.lisp") + :modules (list (make-instance 'module :name "cl-opengl-config.lisp") + (make-instance 'module :name "cl-opengl.lisp") (make-instance 'module :name "gl-def.lisp") (make-instance 'module :name "gl-constants.lisp") (make-instance 'module :name "gl-functions.lisp") @@ -18,24 +18,15 @@ (make-instance 'module :name "ogl-utils.lisp") (make-instance 'module :name "nehe-14.lisp")) :projects (list (make-instance 'project-module :name - "c:\\cell-cultures\\ffi-extender\\ffi-extender")) + "c:\\cell-cultures\\hello-c\\hello-c")) :libraries nil :distributed-files nil + :internally-loaded-files nil :project-package-name :cl-opengl :main-form nil :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) @@ -43,6 +34,7 @@ :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/cl-opengl/glut-extras.lisp diff -u cell-cultures/cl-opengl/glut-extras.lisp:1.4 cell-cultures/cl-opengl/glut-extras.lisp:1.5 --- cell-cultures/cl-opengl/glut-extras.lisp:1.4 Tue Dec 14 04:53:05 2004 +++ cell-cultures/cl-opengl/glut-extras.lisp Fri Apr 8 11:11:19 2005 @@ -43,7 +43,7 @@ (cl-opengl-init) (unless *glut-dll* (print (list "loading GLUT" *glut-dynamic-lib* (probe-file *glut-dynamic-lib*))) - (assert (setq *glut-dll* (ffx:load-foreign-library *glut-dynamic-lib* + (assert (setq *glut-dll* (uffi:load-foreign-library *glut-dynamic-lib* :force-load #+lispworks nil #-lispworks t :module "glut")) () "Unable to load GLUT from: ~a" *glut-dynamic-lib* )) @@ -57,7 +57,7 @@ (setf (eltf argc 0) 0) (unwind-protect (progn - (glut-init argc (ffx:make-null-pointer '(:array :cstring))) + (glut-init argc (uffi:make-null-pointer '(:array :cstring))) (print "glut initialised") ) (fgn-free argc)))) @@ -73,13 +73,13 @@ (or (not (zerop (glgeterror))) (zerop w)))) -(let ((mm (ffx:allocate-foreign-object :int 1))) +(let ((mm (uffi:allocate-foreign-object :int 1))) (defun get-matrix-mode () (glgetintegerv gl_matrix_mode mm) (uffi:deref-array mm '(:array :int) 0))) -(let ((mm (ffx:allocate-foreign-object :int 1)) - (sd (ffx:allocate-foreign-object :int 1))) +(let ((mm (uffi:allocate-foreign-object :int 1)) + (sd (uffi:allocate-foreign-object :int 1))) (defun get-stack-depth () (glgetintegerv gl_matrix_mode mm) (let ((mmi (uffi:deref-array mm '(:array :int) 0))) @@ -93,7 +93,7 @@ (uffi:deref-array sd '(:array :int) 0)))) (defun cello-matrix-mode (&optional (tag :anon)) - (let ((mm (ffx:allocate-foreign-object :int 1)) + (let ((mm (uffi:allocate-foreign-object :int 1)) ) (glgetintegerv gl_matrix_mode mm) (let ((mmi (uffi:deref-array mm '(:array :int) 0))) @@ -104,7 +104,7 @@ ((eql mmi gl_texture) :texture) (t (break "gl-stack-depth> unexpected matrix mode ~a ~a" tag mmi))) - (ffx:free-foreign-object mm))))) + (uffi:free-foreign-object mm))))) (defun glut-stroke-string (font string) "Font must already have been converted to a pointer, string must be Lisp string" Index: cell-cultures/cl-opengl/glut-functions.lisp diff -u cell-cultures/cl-opengl/glut-functions.lisp:1.3 cell-cultures/cl-opengl/glut-functions.lisp:1.4 --- cell-cultures/cl-opengl/glut-functions.lisp:1.3 Tue Dec 14 04:53:05 2004 +++ cell-cultures/cl-opengl/glut-functions.lisp Fri Apr 8 11:11:19 2005 @@ -70,9 +70,6 @@ (ff-defun-callable :cdecl :void mgwclose () (print "closing callback entered")) -(FF:DEFUN-FOREIGN-CALLABLE MGWCLOSE (:VOID) (DECLARE (:CONVENTION :C)) - (PRINT "closing callback entered")) - (defpackage #:cl-opengl (:nicknames #:ogl) (:use) Index: cell-cultures/cl-opengl/nehe-14.lisp diff -u cell-cultures/cl-opengl/nehe-14.lisp:1.3 cell-cultures/cl-opengl/nehe-14.lisp:1.4 --- cell-cultures/cl-opengl/nehe-14.lisp:1.3 Tue Dec 14 04:53:05 2004 +++ cell-cultures/cl-opengl/nehe-14.lisp Fri Apr 8 11:11:19 2005 @@ -96,7 +96,7 @@ (let ((msg (format nil "Hello, ~a ~a" (round (glut-stroke-height (ffi-glut-id id))) stroke-font))) - (with-cstring (cc msg) + (uffi:with-cstring (cc msg) (glut-stroke-string (ffi-glut-id id) msg) (gl-translatef (- (glut-stroke-length (ffi-glut-id id) cc)) 0 0)))))) @@ -114,13 +114,13 @@ (glut-init-window-size 640 480) ;; Window Size If We Start In Windowed Mode (let ((key "NeHe's OpenGL Framework")) - (ffx:with-cstring (key-native key) + (uffi:with-cstring (key-native key) (glut-create-window key-native))) ;(init) ; // Our Initialization ;; Set up the callbacks in OpenGL/GLUT (glut-display-func (ff-register-callable dispfunc)) - (glut-wm-close-func (ff-register-callable mgwclose)) + (glut-wm-close-func (ff-register-callable 'mgwclose)) (glut-keyboard-func (ff-register-callable 'mgwkey)) (gl-matrix-mode gl_projection) @@ -145,7 +145,7 @@ #+test (lesson-14) -(ff-defun-callable :cdecl :void mgwkey (k x y) +(ff-defun-callable :cdecl :void mgwkey ((k :int) (x :int) (y :int)) (print 'bingo) (mgwkeyi k x y)) Index: cell-cultures/cl-opengl/ogl-macros.lisp diff -u cell-cultures/cl-opengl/ogl-macros.lisp:1.4 cell-cultures/cl-opengl/ogl-macros.lisp:1.5 --- cell-cultures/cl-opengl/ogl-macros.lisp:1.4 Tue Dec 14 04:53:05 2004 +++ cell-cultures/cl-opengl/ogl-macros.lisp Fri Apr 8 11:11:19 2005 @@ -102,11 +102,11 @@ (declare (ignorable load-oglfont-p)) (unless *opengl-dll* (print "loading open GL/GLU") - (ffx:load-foreign-library + (uffi:load-foreign-library *gl-dynamic-lib* :module "open-gl") ;; -lispworks#-lispworks - (setf *opengl-dll* (ffx:load-foreign-library *glu-dynamic-lib* + (setf *opengl-dll* (uffi:load-foreign-library *glu-dynamic-lib* :module "gl-util")))) (defun glec (&optional (id :anon)) Index: cell-cultures/cl-opengl/ogl-utils.lisp diff -u cell-cultures/cl-opengl/ogl-utils.lisp:1.6 cell-cultures/cl-opengl/ogl-utils.lisp:1.7 --- cell-cultures/cl-opengl/ogl-utils.lisp:1.6 Tue Dec 14 04:53:05 2004 +++ cell-cultures/cl-opengl/ogl-utils.lisp Fri Apr 8 11:11:19 2005 @@ -139,7 +139,7 @@ ;;(cells::count-it :normalize-3f) (values (+ (/ x m)) (+ (/ y m)) (+ (/ z m))))))) -(ffx:def-foreign-type bool* (* glboolean)) +(uffi:def-foreign-type bool* (* glboolean)) #-lispworks (declaim (type bool* *ogl-boolean*)) @@ -151,7 +151,7 @@ (gl-get-booleanv gl-code *ogl-boolean*) (not (zerop (uffi:deref-array *ogl-boolean* '(:array glboolean) 0)))) -(ffx:def-foreign-type glint* (* glint)) +(uffi:def-foreign-type glint* (* glint)) #-lispworks (declaim (type glint* *ogl-int*))

1 0

[cells-cvs] CVS update: cell-cultures/cl-openal/cl-openal.lpr
by ktilton＠common-lisp.net 08 Apr '05

08 Apr '05

Update of /project/cells/cvsroot/cell-cultures/cl-openal In directory common-lisp.net:/tmp/cvs-serv12564/cl-openal Modified Files: cl-openal.lpr Log Message: Cello cleanup, but mostly "removing" ffi-extender, which really lives on as the "hello-c" package Date: Fri Apr 8 11:11:19 2005 Author: ktilton Index: cell-cultures/cl-openal/cl-openal.lpr diff -u cell-cultures/cl-openal/cl-openal.lpr:1.1 cell-cultures/cl-openal/cl-openal.lpr:1.2 --- cell-cultures/cl-openal/cl-openal.lpr:1.1 Sat Jun 26 20:38:40 2004 +++ cell-cultures/cl-openal/cl-openal.lpr Fri Apr 8 11:11:18 2005 @@ -1,11 +1,10 @@ -;; -*- lisp-version: "6.2 [Windows] (May 12, 2004 22:13)"; common-graphics: "1.389.2.105.2.14"; -*- +;; -*- lisp-version: "7.0 [Windows] (Dec 28, 2004 17:34)"; cg: "1.54.2.17"; -*- -(in-package :common-graphics-user) +(in-package :cg-user) -(defpackage :cl-openal (:export)) +(defpackage :CL-OPENAL) (define-project :name :cl-openal - :application-type (intern "Standard EXE" (find-package :keyword)) :modules (list (make-instance 'module :name "cl-openal.lisp") (make-instance 'module :name "altypes.lisp") (make-instance 'module :name "al.lisp") @@ -17,31 +16,23 @@ (make-instance 'module :name "wav-handling.lisp") (make-instance 'module :name "cl-openal-demo.lisp")) :projects (list (make-instance 'project-module :name - "..\\ffi-extender\\ffi-extender")) + "..\\hello-c\\hello-c")) :libraries nil :distributed-files nil + :internally-loaded-files nil :project-package-name :cl-openal :main-form nil :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

1 0

[cells-cvs] CVS update: cell-cultures/cl-magick/cl-magick.lisp cell-cultures/cl-magick/cl-magick.lpr cell-cultures/cl-magick/mgk-test.lisp cell-cultures/cl-magick/wand-image.lisp
by ktilton＠common-lisp.net 08 Apr '05

08 Apr '05

Update of /project/cells/cvsroot/cell-cultures/cl-magick In directory common-lisp.net:/tmp/cvs-serv12564/cl-magick Modified Files: cl-magick.lisp cl-magick.lpr mgk-test.lisp wand-image.lisp Log Message: Cello cleanup, but mostly "removing" ffi-extender, which really lives on as the "hello-c" package Date: Fri Apr 8 11:11:17 2005 Author: ktilton Index: cell-cultures/cl-magick/cl-magick.lisp diff -u cell-cultures/cl-magick/cl-magick.lisp:1.3 cell-cultures/cl-magick/cl-magick.lisp:1.4 --- cell-cultures/cl-magick/cl-magick.lisp:1.3 Thu Oct 28 02:09:21 2004 +++ cell-cultures/cl-magick/cl-magick.lisp Fri Apr 8 11:11:17 2005 @@ -25,7 +25,7 @@ (:use #:common-lisp #-cormanlisp #:clos - #:ffx + #:hello-c #+cl-opengl #:cl-opengl ;; wands as opengl textures ) @@ -43,19 +43,12 @@ (in-package :cl-magick) -(defparameter *magick-dynamic-lib* :unconfigured) - -(eval-when (:compile-toplevel :load-toplevel) - (load (merge-pathnames "cl-magick-config" - cl-user::*cell-cultures-config*))) - (defun magick-wand-template () (path-to-wand - (merge-pathnames - (make-pathname - :directory '(:relative "templates") - :name "metal" :type "gif") - cl-user::*cell-cultures-graphics-directory*))) + (make-pathname + :directory '(:absolute "cell-cultures" "cell-cultures-user" + "graphics" "templates") + :name "metal" :type "gif"))) (defparameter *imagick-dll-loaded* nil) (defparameter *wands-loaded* nil) Index: cell-cultures/cl-magick/cl-magick.lpr diff -u cell-cultures/cl-magick/cl-magick.lpr:1.2 cell-cultures/cl-magick/cl-magick.lpr:1.3 --- cell-cultures/cl-magick/cl-magick.lpr:1.2 Fri Oct 1 06:01:19 2004 +++ cell-cultures/cl-magick/cl-magick.lpr Fri Apr 8 11:11:17 2005 @@ -1,12 +1,11 @@ -;; -*- 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 :cl-magick (:export)) +(defpackage :CL-MAGICK) (define-project :name :cl-magick - :application-type (intern "Standard EXE" (find-package :keyword)) - :modules (list (make-instance 'module :name "build.lisp") + :modules (list (make-instance 'module :name "cl-magick-config.lisp") (make-instance 'module :name "cl-magick.lisp") (make-instance 'module :name "magick-wand.lisp") (make-instance 'module :name "drawing-wand.lisp") @@ -19,28 +18,20 @@ :projects nil :libraries nil :distributed-files nil + :internally-loaded-files nil :project-package-name :cl-magick :main-form nil :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/cl-magick/mgk-test.lisp diff -u cell-cultures/cl-magick/mgk-test.lisp:1.5 cell-cultures/cl-magick/mgk-test.lisp:1.6 --- cell-cultures/cl-magick/mgk-test.lisp:1.5 Wed Nov 17 13:31:42 2004 +++ cell-cultures/cl-magick/mgk-test.lisp Fri Apr 8 11:11:17 2005 @@ -256,18 +256,17 @@ (gl-tex-coord2f 1 1) (v3f -1 1 1) (gl-tex-coord2f 0 1) (v3f -1 1 -1) )) - (wand-render *grace* 0 0 1 -1)) + ;;(wand-render *grace* 0 0 1 -1) + ) (glut-swap-buffers) (glut-post-redisplay) ) (defun test-image (filename filetype) - (merge-pathnames - (make-pathname - :directory '(:relative "shapers") + (make-pathname + :directory '(:absolute "cell-cultures" "cell-cultures-user" "graphics" "shapers") :name (string filename) - :type (string filetype)) - cl-user::*cell-cultures-graphics-directory*)) + :type (string filetype))) (defun r6init() (gl-enable gl_texture_2d) @@ -286,7 +285,7 @@ #+test (lesson-6) -(ff-defun-callable :cdecl :void r6-reshape (x y) +(ff-defun-callable :cdecl :void r6-reshape ((x :int)(y :int)) (r6reshape x y)) (defun r6reshape (width height) @@ -324,7 +323,7 @@ #+test (cl-magick-test) -(ff-defun-callable :cdecl :void mgwkey (k x y) +(ff-defun-callable :cdecl :void mgwkey ((k :int)(x :int)(y :int)) (mgwkeyi k x y)) (defun mgwkeyi (k x y) Index: cell-cultures/cl-magick/wand-image.lisp diff -u cell-cultures/cl-magick/wand-image.lisp:1.2 cell-cultures/cl-magick/wand-image.lisp:1.3 --- cell-cultures/cl-magick/wand-image.lisp:1.2 Fri Oct 1 06:01:19 2004 +++ cell-cultures/cl-magick/wand-image.lisp Fri Apr 8 11:11:17 2005 @@ -45,7 +45,7 @@ ))) (:input (assert (probe-file (file-path$ self)) () - "Image file ~a not found iinitializing wand" (file-path$ self)) + "Image file ~a not found initializing wand" (file-path$ self)) (assert (not (mgk-wand self))) ;; make sure not leaking (setf (mgk-wand self) (path-to-wand (file-path$ self))) ;(mgk-wand-dump (mgk-wand self) (file-path$ self))

1 0

[cells-cvs] CVS update: cell-cultures/cl-ftgl/cl-ftgl.lisp cell-cultures/cl-ftgl/cl-ftgl.lpr
by ktilton＠common-lisp.net 08 Apr '05

08 Apr '05

Update of /project/cells/cvsroot/cell-cultures/cl-ftgl In directory common-lisp.net:/tmp/cvs-serv12564/cl-ftgl Modified Files: cl-ftgl.lisp cl-ftgl.lpr Log Message: Cello cleanup, but mostly "removing" ffi-extender, which really lives on as the "hello-c" package Date: Fri Apr 8 11:11:17 2005 Author: ktilton Index: cell-cultures/cl-ftgl/cl-ftgl.lisp diff -u cell-cultures/cl-ftgl/cl-ftgl.lisp:1.7 cell-cultures/cl-ftgl/cl-ftgl.lisp:1.8 --- cell-cultures/cl-ftgl/cl-ftgl.lisp:1.7 Sun Dec 5 05:50:41 2004 +++ cell-cultures/cl-ftgl/cl-ftgl.lisp Fri Apr 8 11:11:16 2005 @@ -20,7 +20,7 @@ ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ;;; IN THE SOFTWARE. -;;; $Header: /project/cells/cvsroot/cell-cultures/cl-ftgl/cl-ftgl.lisp,v 1.7 2004/12/05 04:50:41 ktilton Exp $ +;;; $Header: /project/cells/cvsroot/cell-cultures/cl-ftgl/cl-ftgl.lisp,v 1.8 2005/04/08 09:11:16 ktilton Exp $ (defpackage #:cl-ftgl (:nicknames #:ftgl) @@ -56,15 +56,6 @@ #:*gui-style-button-face*)) (in-package :cl-ftgl) - -(defparameter *ftgl-dynamic-lib-path* :unconfigured) -(defparameter *font-directory-path* :unconfigured) -(defparameter *gui-style-default-face* :unconfigured) -(defparameter *gui-style-button-face* :unconfigured) - -(eval-when (compile load eval) - (load (merge-pathnames "cl-ftgl-config" - cl-user::*cell-cultures-config*))) ;; ---------------------------------------------------------------------------- ;; EXTERNAL DEPENDENCIES Index: cell-cultures/cl-ftgl/cl-ftgl.lpr diff -u cell-cultures/cl-ftgl/cl-ftgl.lpr:1.1 cell-cultures/cl-ftgl/cl-ftgl.lpr:1.2 --- cell-cultures/cl-ftgl/cl-ftgl.lpr:1.1 Sat Jun 26 20:38:39 2004 +++ cell-cultures/cl-ftgl/cl-ftgl.lpr Fri Apr 8 11:11:16 2005 @@ -1,37 +1,29 @@ -;; -*- lisp-version: "6.2 [Windows] (Jun 26, 2002 11:39)"; 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 :cl-ftgl (:export)) +(defpackage :CL-FTGL) (define-project :name :cl-ftgl - :application-type (intern "Standard EXE" (find-package :keyword)) - :modules (list (make-instance 'module :name "cl-ftgl.lisp")) + :modules (list (make-instance 'module :name "cl-ftgl-config.lisp") + (make-instance 'module :name "cl-ftgl.lisp")) :projects nil :libraries nil :distributed-files nil + :internally-loaded-files nil :project-package-name :cl-ftgl :main-form nil :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

1 0