;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-;; $Id: cairo.lisp,v 1.1 2005-11-10 08:50:45 espen Exp $
+;; $Id: cairo.lisp,v 1.16 2007-10-16 07:48:39 espen Exp $
(in-package "CAIRO")
(eval-when (:compile-toplevel :load-toplevel :execute)
(define-enum-type surface-format :argb32 :rgb24 :a8 :a1)
+ (define-enum-type content :color :alpha :color-alpha)
+ (define-enum-type svg-version :svg-1.1 :svg-1.2)
(define-enum-type status
:success :no-memory :invalid-restore :invalid-pop-group
(define-enum-type fill-rule :winding :even-odd)
(define-enum-type line-cap :butt :round :square)
(define-enum-type line-join :miter :round :bevel)
- (define-enum-type font-slant :normal :itaic :oblique)
+ (define-enum-type font-slant :normal :italic :oblique)
(define-enum-type font-weight :normal :bold)
(define-enum-type operator
(define-enum-type hint-style :default :none :slight :medium :full)
(define-enum-type hint-metrics :default :off :on)
- (defclass glyph (proxy)
+
+ (define-enum-type surface-type
+ image-surface pdf-surface ps-surface xlib-surface xcb-surface
+ glitz-surface quartz-surface win32-surface beos-surface
+ directfb-surface svg-surface os2-surface)
+
+ (defclass surface-class (proxy-class)
+ ())
+
+ (defmethod validate-superclass ((class surface-class) (super standard-class))
+ (subtypep (class-name super) 'surface))
+
+ (defclass glyph (struct)
((index
:allocation :alien
:initarg :index
:type double-float))
(:metaclass struct-class))
- (defclass font-face (proxy)
+ (defclass font-face (ref-counted-object)
()
- (:metaclass proxy-class))
+ (:metaclass proxy-class)
+ (:ref %font-face-reference)
+ (:unref %font-face-destroy))
- (defclass font-options (proxy)
+ (defclass font-options (ref-counted-object)
((antialias
:allocation :virtual
:getter "font_options_get_antialias"
:setter "font_options_set_hint_metrics"
:accessor font-options-hint-metrics
:type hint-metrics))
- (:metaclass proxy-class))
+ (:metaclass proxy-class)
+ (:ref %font-options-reference)
+ (:unref %font-options-destroy))
- (defclass scaled-font (proxy)
+ (defclass scaled-font (ref-counted-object)
()
- (:metaclass proxy-class))
+ (:metaclass proxy-class)
+ (:ref %scaled-font-reference)
+ (:unref %scaled-font-destroy))
(defclass matrix (struct)
((xx :allocation :alien :initarg :xx :initform 1.0
(y-advance :allocation :alien :reader text-extents-y-advance :type double-float))
(:metaclass struct-class))
- (defclass pattern (proxy)
+ (defclass pattern (ref-counted-object)
((extend
:allocation :virtual
:getter "cairo_pattern_get_extend"
:setter "cairo_pattern_set_matrix"
:accessor pattern-matrix
:type matrix))
- (:metaclass proxy-class))
+ (:metaclass proxy-class)
+ (:ref %pattern-reference)
+ (:unref %pattern-destroy))
+
+
+ (defclass surface (ref-counted-object)
+ ((content
+ :allocation :virtual
+ :getter "cairo_surface_get_content"
+ :reader surface-content
+ :type content))
+ (:metaclass surface-class))
+
+ (defclass image-surface (surface)
+ ((data
+ :allocation :virtual
+ :getter "cairo_image_surface_get_data"
+ :reader surface-data
+ :type pointer)
+ (format
+ :allocation :virtual
+ :getter "cairo_image_surface_get_format"
+ :reader surface-format
+ :type surface-format)
+ (width
+ :allocation :virtual
+ :getter "cairo_image_surface_get_width"
+ :reader surface-width
+ :type int)
+ (height
+ :allocation :virtual
+ :getter "cairo_image_surface_get_height"
+ :reader surface-height
+ :type int)
+ (stride
+ :allocation :virtual
+ :getter "cairo_image_surface_get_stride"
+ :reader surface-stride
+ :type int))
+ (:metaclass surface-class))
+
+ (defclass xlib-surface (surface)
+ ((width
+ :allocation :virtual
+ :getter "cairo_xlib_surface_get_width"
+ :reader surface-width
+ :type int)
+ (height
+ :allocation :virtual
+ :getter "cairo_xlib_surface_get_height"
+ :reader surface-height
+ :type int))
+ (:metaclass surface-class))
+
+ (defclass pdf-surface (surface)
+ ()
+ (:metaclass surface-class))
+
+ (defclass ps-surface (surface)
+ ()
+ (:metaclass surface-class))
+
+ (defclass svg-surface (surface)
+ ()
+ (:metaclass surface-class))
- (defclass context (proxy)
+
+ (defclass context (ref-counted-object)
((target
:allocation :virtual
:getter "cairo_get_target"
:writer (setf matrix)
:type matrix)
)
- (:metaclass proxy-class))
-
- (defclass surface (proxy)
- ()
- (:metaclass proxy-class))
+ (:metaclass proxy-class)
+ (:ref %reference)
+ (:unref %destroy))
- (defclass image-surface (surface)
- ((width
- :allocation :virtual
- :getter "cairo_image_surface_get_width"
- :reader surface-width
- :type int)
- (height
- :allocation :virtual
- :getter "cairo_image_surface_get_height"
- :reader surface-height
- :type int))
- (:metaclass proxy-class))
;; (defclass path (proxy)
;; ()
;; (:metaclass proxy-class))
-)
+ )
;;; Cairo context
-(defbinding %reference () nil
+(defmethod allocate-foreign ((context context) &key target)
+ (%create-context target))
+
+(defbinding (%create-context "cairo_create") () pointer
+ (target surface))
+
+(defbinding %reference () pointer
(location pointer))
(defbinding %destroy () nil
(location pointer))
-(defmethod reference-foreign ((class (eql (find-class 'context))) location)
- (%reference location))
-
-(defmethod unreference-foreign ((class (eql (find-class 'context))) location)
- (%destroy location))
-
(defbinding (save-context "cairo_save") () nil
(cr context))
(defbinding (restore-context "cairo_restore") () nil
(cr context))
-(defmacro with-context ((cr) &body body)
- (let ((context (make-symbol "CONTEXT")))
+(defmacro with-context ((cr &optional var) &body body)
+ (let ((context (or var (make-symbol "CONTEXT"))))
`(let ((,context ,cr))
(save-context ,context)
(unwind-protect
(defbinding status () status
(cr context))
+(defun ensure-color-component (component)
+ (etypecase component
+ (float component)
+ (integer (/ component 256.0))))
+
(defbinding (set-source-color "cairo_set_source_rgba") (cr red green blue &optional (alpha 1.0)) nil
(cr context)
- (red double-float)
- (green double-float)
- (blue double-float)
- (alpha double-float))
+ ((ensure-color-component red) double-float)
+ ((ensure-color-component green) double-float)
+ ((ensure-color-component blue) double-float)
+ ((ensure-color-component alpha) double-float))
-(defbinding set-source-surface () nil
+(defbinding set-source-surface (cr surface &optional (x 0.0) (y 0.0)) nil
(cr context)
(surface surface)
(x double-float)
(y double-float))
+(defun set-source (cr source)
+ (etypecase source
+ (pattern (setf (source cr) source))
+ (surface (set-source-surface cr source))
+ (null (set-source-color cr 0.0 0.0 0.0))
+ (list (apply #'set-source-color cr source))
+ (vector (apply #'set-source-color cr (coerce source 'list)))))
+
(defbinding set-dash (cr dashes &optional (offset 0.0)) nil
(cr context)
(dashes (vector double-float))
(,pname cr)
(,iname cr)))
,(unless clip-p
- (let ((tname (intern (format nil "IN~A-P" name)))
+ (let ((tname (intern (format nil "IN-~A-P" name)))
(ename (intern (format nil "~A-EXTENTS" name))))
`(progn
(defbinding ,tname () boolean
(cr context)
(x double-float)
(y double-float))
- (defbinding ,ename () boolean
+ (defbinding ,ename () nil
(cr context)
(x1 double-float :out)
(y1 double-float :out)
(defbinding new-path () nil
(cr context))
-(defbinding close-path () nil
+#?(pkg-exists-p "cairo" :atleast-version "1.2")
+(defbinding new-sub-path () nil
(cr context))
-(defbinding arc () nil
- (cr context)
- (xc double-float)
- (yc double-float)
- (radius double-float)
- (angle1 double-float)
- (angle2 double-float))
-
-(defbinding arc-negative () nil
- (cr context)
- (xc double-float)
- (yc double-float)
- (radius double-float)
- (angle1 double-float)
- (angle2 double-float))
-
-(defun circle (cr x y radius)
- (arc cr x y radius 0.0 (* pi 2)))
-
-(defmacro defpath (name &rest args)
- (let ((relname (intern (format nil "REL-~A" name))))
- `(progn
- (defbinding ,name () nil
- (cr context)
- ,@args)
- (defbinding ,relname () nil
- (cr context)
- ,@args))))
-
-(defpath curve-to
- (x1 double-float)
- (y1 double-float)
- (x2 double-float)
- (y2 double-float)
- (x3 double-float)
- (y3 double-float))
-
-(defpath line-to
- (x double-float)
- (y double-float))
+(defbinding close-path () nil
+ (cr context))
-(defpath move-to
- (x double-float)
- (y double-float))
+(defmacro defpath (name args &optional relative-p)
+ (flet ((def (name type)
+ `(progn
+ ,(when (eq type 'optimized-double-float)
+ `(declaim (inline ,(first name))))
+ (defbinding ,name () nil
+ (cr context)
+ ,@(mapcar #'(lambda (arg) (list arg type)) args)))))
+
+ `(progn
+ ,(def name 'double-float)
+ ,(let ((name (intern (format nil "FAST-~A" name)))
+ (cname (gffi::default-alien-fname name)))
+ (def (list name cname) 'optimized-double-float))
+ ,@(when relative-p
+ (let* ((rel-name (intern (format nil "REL-~A" name)))
+ (fast-rel-name (intern (format nil "FAST-REL-~A" name)))
+ (cname (gffi::default-alien-fname rel-name)))
+ (list
+ (def rel-name 'double-float)
+ (def (list fast-rel-name cname) 'optimized-double-float)))))))
+
+
+(defpath arc (xc yc radius angle1 angle2))
+(defpath arc-negative (xc yc radius angle1 angle2))
+(defpath curve-to (x1 y1 x2 y2 x3 y3) t)
+(defpath line-to (x y) t)
+(defpath move-to (x y) t)
+(defpath rectangle (x y width height))
+
+(defun circle (cr x y radius &optional negative-p)
+ (move-to cr radius 0.0d0)
+ (if negative-p
+ (arc-negative cr x y radius (* pi 2) 0.0d0)
+ (arc cr x y radius 0.0d0 (* pi 2)))
+ (close-path cr))
-(defbinding rectangle () nil
- (cr context)
- (x double-float)
- (y double-float)
- (width double-float)
- (height double-float))
(defbinding glyph-path (cr glyphs) nil
(cr context)
(pattern offset red green blue &optional (alpha 1.0)) nil
(pattern pattern)
(offset double-float)
- (red double-float)
- (green double-float)
- (blue double-float)
- (alpha double-float))
+ ((ensure-color-component red) double-float)
+ ((ensure-color-component green) double-float)
+ ((ensure-color-component blue) double-float)
+ ((ensure-color-component alpha) double-float))
(defbinding (pattern-create "cairo_pattern_create_rgba")
(red green blue &optional (alpha 1.0)) pattern
- (red double-float)
- (green double-float)
- (blue double-float)
- (alpha double-float))
+ ((ensure-color-component red) double-float)
+ ((ensure-color-component green) double-float)
+ ((ensure-color-component blue) double-float)
+ ((ensure-color-component alpha) double-float))
(defbinding pattern-create-for-surface () pattern
(surface surface))
(cy1 double-float)
(radius1 double-float))
-(defbinding %pattern-reference () nil
+(defbinding %pattern-reference () pointer
(location pointer))
(defbinding %pattern-destroy () nil
(location pointer))
-(defmethod reference-foreign ((class (eql (find-class 'pattern))) location)
- (%pattern-reference location))
-
-(defmethod unreference-foreign ((class (eql (find-class 'pattern))) location)
- (%pattern-destroy location))
-
(defbinding pattern-status () status
(pattern pattern))
(tx double-float)
(ty double-float))
-(defbinding scale () nil
+(defbinding scale (cr sx &optional (sy sx)) nil
(cr context)
(sx double-float)
(sy double-float))
+(defun scale-to-device (cr &optional keep-rotation-p)
+ (if keep-rotation-p
+ (multiple-value-bind (dx dy) (device-to-user-distance cr 1.0 0.0)
+ (scale cr (sqrt (+ (* dx dx) (* dy dy)))))
+ (multiple-value-bind (x y)
+ (with-context (cr)
+ (move-to cr 0.0 0.0)
+ (multiple-value-call #'user-to-device cr (get-current-point cr)))
+ (identity-matrix cr)
+ (translate cr x y))))
+
(defbinding rotate () nil
(cr context)
(angle double-float))
(defbinding (matrix "cairo_get_matrix") () nil
(cr context)
- ((make-instance 'matrix) matrix :return))
+ ((make-instance 'matrix) matrix :in/return))
(defbinding identity-matrix () nil
(cr context))
(defbinding user-to-device () nil
(cr context)
- (x double-float :in-out)
- (y double-float :in-out))
+ (x double-float :in/out)
+ (y double-float :in/out))
-(defbinding user-to-device-distance () nil
+(defbinding user-to-device-distance (cr dx &optional (dy dx)) nil
(cr context)
- (dx double-float :in-out)
- (dy double-float :in-out))
+ (dx double-float :in/out)
+ (dy double-float :in/out))
(defbinding device-to-user () nil
(cr context)
- (x double-float :in-out)
- (y double-float :in-out))
+ (x double-float :in/out)
+ (y double-float :in/out))
-(defbinding device-to-user-distance () nil
+(defbinding device-to-user-distance (cr dx &optional (dy dx)) nil
(cr context)
- (dx double-float :in-out)
- (dy double-float :in-out))
+ (dx double-float :in/out)
+ (dy double-float :in/out))
;;; Text
(defbinding text-extents (cr text &optional (extents (make-instance 'text-extents))) nil
(cr context)
(text string)
- (extents text-extents :return))
+ (extents text-extents :in/return))
(defbinding glyph-extents (cr glyphs &optional (extents (make-instance 'text-extents))) nil
(cr context)
(glyphs (vector glyph))
((length glyphs) int)
- (extents text-extents :return))
+ (extents text-extents :in/return))
;;; Fonts
-(defbinding %font-face-reference () nil
+(defbinding %font-face-reference () pointer
(location pointer))
(defbinding %font-face-destroy () nil
(location pointer))
-(defmethod reference-foreign ((class (eql (find-class 'font-face))) location)
- (%font-face-reference location))
-
-(defmethod unreference-foreign ((class (eql (find-class 'font-face))) location)
- (%font-face-destroy location))
-
(defbinding font-face-status () status
(font-face font-face))
;;; Scaled Fonts
-(defbinding %scaled-font-reference () nil
+(defbinding %scaled-font-reference () pointer
(location pointer))
(defbinding %scaled-font-destroy () nil
(location pointer))
-(defmethod reference-foreign ((class (eql (find-class 'scaled-font))) location)
- (%scaled-font-reference location))
-
-(defmethod unreference-foreign ((class (eql (find-class 'scaled-font))) location)
- (%scaled-font-destroy location))
-
(defbinding scaled-font-status () status
(scaled-font scaled-font))
(defbinding scaled-font-extents (scaled-font &optional (extents (make-instance 'text-extents))) nil
(scaled-font scaled-font)
- (extents text-extents :return))
+ (extents text-extents :in/return))
(defbinding scaled-font-glyph-extents (scaled-font glyphs &optional (extents (make-instance 'text-extents))) nil
(scaled-font scaled-font)
(glyphs (vector glyph))
((length glyphs) int)
- (extents text-extents :return))
+ (extents text-extents :in/return))
(defbinding %scaled-font-create () pointer
(font-face font-face)
(ctm matrix)
(options font-options))
-(defmethod initialize-instance ((scaled-font scaled-font) &key font-face font-matrix cmt options)
- (setf
- (slot-value scaled-font 'location)
- (%scaled-font-create font-face font-matrix cmt options))
- (call-next-method))
+(defmethod allocate-foreign ((scaled-font scaled-font) &key font-face font-matrix cmt options)
+ (%scaled-font-create font-face font-matrix cmt options))
(defbinding %font-options-destroy () nil
(location pointer))
-(defmethod reference-foreign ((class (eql (find-class 'font-options))) location)
- (%font-options-reference location))
-
-(defmethod unreference-foreign ((class (eql (find-class 'font-options))) location)
- (%font-options-destroy location))
-
(defbinding font-options-status () status
(font-options font-options))
(defbinding %font-options-create () pointer)
-(defmethod initialize-instance ((font-options font-options) &rest initargs)
+(defmethod allocate-foreign ((font-options font-options) &rest initargs)
(declare (ignore initargs))
- (setf (slot-value font-options 'location) (%font-options-create))
- (call-next-method))
+ (%font-options-create))
(defbinding font-options-merge () nil
- (options1 font-options :return)
+ (options1 font-options :in/return)
(options2 font-options))
(defbinding font-options-hash () unsigned-int
;;; Surfaces
-(defbinding %surface-reference () nil
+(defmethod make-proxy-instance :around ((class surface-class) location
+ &rest initargs)
+ (let ((class (find-class (%surface-get-type location))))
+ (apply #'call-next-method class location initargs)))
+
+(defbinding %surface-get-type () surface-type
+ (location pointer))
+
+(defbinding %surface-reference () pointer
(location pointer))
(defbinding %surface-destroy () nil
(location pointer))
-(defmethod reference-foreign ((class (eql (find-class 'surface))) location)
- (%surface-reference location))
+(defmethod reference-function ((class surface-class))
+ (declare (ignore class))
+ #'%surface-reference)
+
+(defmethod unreference-function ((class surface-class))
+ (declare (ignore class))
+ #'%surface-destroy)
+
+(defbinding %surface-set-user-data (surface key data-id) status
+ (surface pointer)
+ ((quark-intern key) pointer-data)
+ (data-id pointer-data)
+ (user-data-destroy-callback callback))
-(defmethod unreference-foreign ((class (eql (find-class 'surface))) location)
- (%surface-destroy location))
+(defmethod (setf user-data) (data (surface surface) key)
+ (%surface-set-user-data (foreign-location surface) key (register-user-data data))
+ data)
+
+(defbinding %surface-get-user-data () pointer-data
+ (surface surface)
+ (key pointer-data))
+
+(defmethod user-data ((surface surface) key)
+ (find-user-data (%surface-get-user-data surface (quark-intern key))))
(defbinding surface-create-similar () surface
(other surface)
(defbinding surface-get-font-options () nil
(surface surface)
- ((make-instance 'font-options) font-options :return))
+ ((make-instance 'font-options) font-options :in/return))
(defbinding surface-set-device-offset () nil
(surface surface)
(%surface-mark-dirty-rectangle surface x y width height)
(%surface-mark-dirty surface)))
+(defbinding surface-set-fallback-resolution () nil
+ (surface surface)
+ (x-pixels-per-inch double-float)
+ (y-pixels-per-inch double-float))
+
+(define-callback stream-write-func status
+ ((stream-id pointer-data) (data pointer) (length unsigned-int))
+ (let ((stream (find-user-data stream-id)))
+ (typecase stream
+ (stream
+ (map-c-vector 'nil #'(lambda (octet) (write-byte octet stream))
+ data '(unsigned-byte 8) length))
+ ((or symbol function)
+ (funcall stream
+ (map-c-vector 'vector #'identity data '(unsigned-byte 8) length)))))
+ :success)
+
+
+(defmacro with-surface ((surface cr) &body body)
+ `(let ((,cr (make-instance 'context :target ,surface)))
+ ,@body))
;; Image Surface
;; Should data be automatically freed when the surface is GCed?
-(defmethod initialize-instance ((surface image-surface)
- &key width height stride format data)
- (setf
- (slot-value surface 'location)
- (if (not data)
- (%image-surface-create format width height)
- (%image-surface-create-for-data data format width height
- (or
- stride
- (let ((element-size (cdr (assoc format '((:argb32 . 4) (:rgb24 . 4) (:a8 . 1) (:a1 1/8))))))
- (ceiling (* width element-size)))))))
- (call-next-method))
-
-
-(defbinding %image-surface-create () image-surface
+(defmethod allocate-foreign ((surface image-surface)
+ &key filename width height stride format data)
+ (cond
+ (filename (%image-surface-create-from-png filename))
+ ((not data) (%image-surface-create format width height))
+ (t
+ (%image-surface-create-for-data data format width height
+ (or
+ stride
+ (let ((element-size (cdr (assoc format '((:argb32 . 4) (:rgb24 . 4) (:a8 . 1) (:a1 1/8))))))
+ (ceiling (* width element-size))))))))
+
+
+(defbinding %image-surface-create () pointer
(format surface-format)
(width int)
(hegit int))
-(defbinding %image-surface-create-for-data () image-surface
+(defbinding %image-surface-create-for-data () pointer
(data pointer)
(format surface-format)
(width int)
(hegit int)
(stride int))
+(defbinding %image-surface-create-from-png () pointer
+ (filename pathname))
+
+(defbinding surface-write-to-png () status
+ (surface surface)
+ (filename pathname))
+
+
+;;; PDF Surface
+
+(defmethod allocate-foreign ((surface pdf-surface)
+ &key filename stream width height)
+ (cond
+ ((and filename stream)
+ (error "Only one of the arguments :filename and :stream may be specified"))
+ (filename (%pdf-surface-create filename width height))
+ (stream
+ (let* ((stream-id (register-user-data stream))
+ (location (%pdf-surface-create-for-stream stream-id width height)))
+ (%surface-set-user-data location 'stream stream-id)
+ location))))
+
+
+(defbinding %pdf-surface-create () pointer
+ (filename pathname)
+ (width double-float)
+ (height double-float))
+
+(defbinding %pdf-surface-create-for-stream (stream width height) pointer
+ (stream-write-func callback)
+ (stream pointer-data)
+ (width double-float)
+ (height double-float))
+
+(defbinding pdf-surface-set-size () nil
+ (surface pdf-surface)
+ (width double-float)
+ (height double-float))
+
+;;; PS Surface
-;;; PNG Surface
+(defmethod allocate-foreign ((surface ps-surface)
+ &key filename stream width height)
+ (cond
+ ((and filename stream)
+ (error "Only one of the arguments :filename and :stream may be specified"))
+ (filename (%ps-surface-create filename width height))
+ (stream
+ (let* ((stream-id (register-user-data stream))
+ (location (%ps-surface-create-for-stream stream-id width height)))
+ (%surface-set-user-data location 'stream stream-id)
+ location))))
+
+(defbinding %ps-surface-create () pointer
+ (filename pathname)
+ (width double-float)
+ (height double-float))
+
+(defbinding %ps-surface-create-for-stream (stream width height) pointer
+ (stream-write-func callback)
+ (stream pointer-data)
+ (width double-float)
+ (height double-float))
+
+(defbinding ps-surface-set-size () nil
+ (surface ps-surface)
+ (width double-float)
+ (height double-float))
-(defbinding image-surface-create-from-png (filename) image-surface
- ((truename filename) pathname))
+(defbinding ps-surface-dsc-begin-setup () nil
+ (surface ps-surface))
+(defbinding ps-surface-dsc-begin-page-setup () nil
+ (surface ps-surface))
+
+(defbinding ps-surface-dsc-comment () nil
+ (surface ps-surface)
+ (comment string))
+
+
+;;; SVG Surface
+
+(defmethod allocate-foreign ((surface svg-surface)
+ &key filename stream width height)
+ (cond
+ ((and filename stream)
+ (error "Only one of the arguments :filename and :stream may be specified"))
+ (filename (%svg-surface-create filename width height))
+ (stream
+ (let* ((stream-id (register-user-data stream))
+ (location (%svg-surface-create-for-stream stream-id width height)))
+ (%surface-set-user-data location 'stream stream-id)
+ location))))
+
+(defbinding %svg-surface-create () pointer
+ (filename pathname)
+ (width double-float)
+ (height double-float))
+
+(defbinding %svg-surface-create-for-stream (stream width height) pointer
+ (stream-write-func callback)
+ (stream pointer-data)
+ (width double-float)
+ (height double-float))
+
+(defbinding svg-surface-restrict-to-version () nil
+ (surface svg-surface)
+ (version svg-version))
;;; Matrices
(defbinding matrix-init () nil
- (matrix matrix :return)
+ (matrix matrix :in/return)
(xx double-float) (yx double-float)
(xy double-float) (yy double-float)
(x0 double-float) (y0 double-float))
-(defbinding matrix-init-identity () nil
- (matrix matrix :return))
+(defbinding matrix-init-identity (&optional (matrix (make-instance 'matrix))) nil
+ (matrix matrix :in/return))
+
+(defun identity-matrix-p (matrix)
+ (with-slots (xx yx xy yy x0 y0) matrix
+ (and
+ (= xx 1.0d0) (= yx 0.0d0) (= xy 0.0d0)
+ (= yy 1.0d0) (= x0 0.0d0) (= y0 0.0d0))))
(defbinding matrix-init-translate () nil
- (matrix matrix :return)
+ (matrix matrix :in/return)
(tx double-float)
(ty double-float))
-(defbinding matrix-init-scale () nil
- (matrix matrix :return)
+(defbinding matrix-init-scale (matrix sx &optional (sy sx)) nil
+ (matrix matrix :in/return)
(sx double-float)
(sy double-float))
(defbinding matrix-init-rotate () nil
- (matrix matrix :return)
+ (matrix matrix :in/return)
(radians double-float))
(defbinding matrix-translate () nil
- (matrix matrix :return)
+ (matrix matrix :in/return)
(tx double-float)
(ty double-float))
-(defbinding matrix-scale () nil
- (matrix matrix :return)
+(defbinding matrix-scale (matrix sx &optional (sy sx)) nil
+ (matrix matrix :in/return)
(sx double-float)
(sy double-float))
(defbinding matrix-rotate () nil
- (matrix matrix :return)
+ (matrix matrix :in/return)
(radians double-float))
(defbinding matrix-invert () nil
- (matrix matrix :return))
+ (matrix matrix :in/return))
(defbinding matrix-multiply () nil
(result matrix :out)
(a matrix)
(b matrix))
-(defbinding matrix-transform-distance () nil
- (matrix matrix :return)
- (dx double-float)
- (dy double-float))
+(defbinding matrix-transform-distance (matrix dx &optional (dy dx)) nil
+ (matrix matrix)
+ (dx double-float :in/out)
+ (dy double-float :in/out))
(defbinding matrix-transform-point () nil
- (matrix matrix :return)
- (x double-float)
- (y double-float))
-
-
-
+ (matrix matrix)
+ (x double-float :in/out)
+ (y double-float :in/out))
~mdw / clg / blobdiff