diff options
Diffstat (limited to 'chickadee/graphics/color.scm')
| -rw-r--r-- | chickadee/graphics/color.scm | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/chickadee/graphics/color.scm b/chickadee/graphics/color.scm index 1611f89..ed89082 100644 --- a/chickadee/graphics/color.scm +++ b/chickadee/graphics/color.scm @@ -20,6 +20,7 @@ ;;; Code: (define-module (chickadee graphics color) + #:use-module (chickadee data bytestruct) #:use-module (chickadee graphics engine) #:use-module (chickadee graphics gl) #:use-module (chickadee math) @@ -28,7 +29,8 @@ #:use-module (srfi srfi-9) #:use-module (srfi srfi-9 gnu) #:use-module (srfi srfi-1) - #:export (make-color + #:export (<color> + make-color make-color8 color? color-r @@ -128,31 +130,16 @@ color-mask-blue? color-mask-alpha?)) -(define-record-type <color> - (wrap-color bv) +(define-byterecord-type <color> + (%make-color r g b a) color? - (bv unwrap-color)) - -(define-inlinable (color-r color) - (f32vector-ref (unwrap-color color) 0)) - -(define-inlinable (color-g color) - (f32vector-ref (unwrap-color color) 1)) - -(define-inlinable (color-b color) - (f32vector-ref (unwrap-color color) 2)) - -(define-inlinable (color-a color) - (f32vector-ref (unwrap-color color) 3)) - -(define (display-color c port) - (format port "#<color r: ~1,3f, g: ~1,3f, b: ~1,3f, a: ~1,3f>" - (color-r c) (color-g c) (color-b c) (color-a c))) - -(set-record-type-printer! <color> display-color) + (r f32 color-r) + (g f32 color-g) + (b f32 color-b) + (a f32 color-a)) (define* (make-color r g b #:optional (a 1.0)) - (wrap-color (f32vector r g b a))) + (%make-color r g b a)) (define* (make-color8 r g b #:optional (a 255)) (make-color (/ r 255.0) (/ g 255.0) (/ b 255.0) (/ a 255.0))) |