[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

[Kenny Tilton]

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))