From 0c4dbd8972ac82133ae6bb7b660f45a39e4c2768 Mon Sep 17 00:00:00 2001 From: Julian Squires Date: Mon, 13 Apr 2009 15:51:20 -0400 Subject: [PATCH] Temporarily remove ILUT. --- cl-devil.asd | 2 +- il.lisp | 16 ++++++++++++++-- package.lisp | 8 ++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/cl-devil.asd b/cl-devil.asd index 11f6460..f3e1a3e 100644 --- a/cl-devil.asd +++ b/cl-devil.asd @@ -10,6 +10,6 @@ ((:file "package") (:file "il" :depends-on ("package")) #+(or)(:file "ilu" :depends-on ("package" "il")) - (:file "ilut" :depends-on ("package" "il")) + ;;(:file "ilut" :depends-on ("package" "il")) (:file "utilities" :depends-on ("package" "il")))) diff --git a/il.lisp b/il.lisp index 5be79ea..61d200a 100644 --- a/il.lisp +++ b/il.lisp @@ -123,7 +123,9 @@ (:image-offy #x0DFC) (:image-cubeflags #x0DFD) (:image-origin #x0DFE) - (:image-channels #x0DFF)) + (:image-channels #x0DFF) + (:use-key-color #x0635) + (:png-alpha-index #x0724)) (define-foreign-type pathname-string-type () () @@ -160,4 +162,14 @@ (defcfun ("ilBlit" blit) :boolean (source :uint) (dest-x :int) (dest-y :int) (dest-z :int) (src-x :int) (src-y :int) (src-z :int) (width :uint) (height :uint) (depth :uint)) (defcfun ("ilGetError" get-error) error) -(defcfun ("ilGetInteger" get-integer) :uint (mode mode)) \ No newline at end of file +(defcfun ("ilKeyColour" key-color) :void (red :float) (green :float) (blue :float) (alpha :float)) +(defcfun ("ilGetPalette" get-palette) :pointer) + +(defcfun ("ilGetInteger" get-integer) :uint (mode mode)) +(defcfun ("ilSetInteger" set-integer) :void (mode mode) (param :int)) +(defcfun ("ilEnable" enable) :boolean (mode mode)) +(defcfun ("ilDisable" disable) :boolean (mode mode)) +(defcfun ("ilIsEnabled" enabled-p) :boolean (mode mode)) + +(defcfun ("ilConvertImage" convert-image) :boolean (format data-format) (type data-type)) +(defcfun ("ilFlipImage" flip-image) :boolean) diff --git a/package.lisp b/package.lisp index 0c461de..a77f8c4 100644 --- a/package.lisp +++ b/package.lisp @@ -12,14 +12,21 @@ ;; bindings #:BIND-IMAGE #:BLIT + #:CONVERT-IMAGE #:COPY-IMAGE #:COPY-PIXELS #:DELETE-IMAGES + #:DISABLE + #:ENABLE + #:FLIP-IMAGE #:GEN-IMAGES #:GET-DATA #:GET-ERROR #:GET-INTEGER + #:GET-PALETTE #:INIT + #:IS-ENABLED + #:KEY-COLOR #:LOAD #:LOAD-F #:LOAD-IMAGE @@ -30,6 +37,7 @@ #:SAVE-IMAGE #:SAVE-L #:SET-DATA + #:SET-INTEGER #:SET-PIXELS #:SHUTDOWN #:TEX-IMAGE -- 2.11.4.GIT