From 31436be9c2e4fa72d95eacf9c196abc0f9544b31 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Sun, 26 Jun 2022 21:34:39 +0200 Subject: Fixture library: update older definitions to new system --- guile/starlet/fixture-library/chauvet/mav2.scm | 49 +++++++++++ .../fixture-library/chauvet/mav2/32chan.scm | 49 ----------- guile/starlet/fixture-library/generic/any-rgb.scm | 62 -------------- guile/starlet/fixture-library/generic/rgb.scm | 17 ++-- guile/starlet/fixture-library/robe/mmxwashbeam.scm | 93 +++++++++++++++++++++ .../fixture-library/robe/mmxwashbeam/mode1.scm | 94 ---------------------- 6 files changed, 150 insertions(+), 214 deletions(-) create mode 100644 guile/starlet/fixture-library/chauvet/mav2.scm delete mode 100644 guile/starlet/fixture-library/chauvet/mav2/32chan.scm delete mode 100644 guile/starlet/fixture-library/generic/any-rgb.scm create mode 100644 guile/starlet/fixture-library/robe/mmxwashbeam.scm delete mode 100644 guile/starlet/fixture-library/robe/mmxwashbeam/mode1.scm diff --git a/guile/starlet/fixture-library/chauvet/mav2.scm b/guile/starlet/fixture-library/chauvet/mav2.scm new file mode 100644 index 0000000..d79e73e --- /dev/null +++ b/guile/starlet/fixture-library/chauvet/mav2.scm @@ -0,0 +1,49 @@ +;; +;; starlet/fixture-library/chauvet.scm +;; +;; Copyright © 2020-2021 Thomas White +;; +;; This file is part of Starlet. +;; +;; Starlet is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see . +;; +(define-module (starlet fixture-library chauvet mav2) + #:use-module (starlet scanout) + #:use-module (starlet fixture) + #:use-module (starlet utils) + #:use-module (starlet colours) + #:export ()) + + +(define-fixture + + + + (fixture-attributes + (attr-continuous 'intensity '(0 100) 0) + (attr-continuous 'pan '(0 540) 270) + (attr-continuous 'tilt '(0 270) 135) + (attr-continuous 'cyan '(0 100) 0) + (attr-continuous 'magenta '(0 100) 0) + (attr-continuous 'yellow '(0 100) 0)) + + (set-chan-16bit 1 (get-attr 'pan) 540) + (set-chan-16bit 3 (get-attr 'tilt) 270) + (set-chan-16bit 6 (get-attr 'intensity) 100) + + (set-chan 10 (percent->dmxval (get-attr 'cyan))) + (set-chan 11 (percent->dmxval (get-attr 'magenta))) + (set-chan 12 (percent->dmxval (get-attr 'yellow))) + + (set-chan 8 255)) diff --git a/guile/starlet/fixture-library/chauvet/mav2/32chan.scm b/guile/starlet/fixture-library/chauvet/mav2/32chan.scm deleted file mode 100644 index 5868587..0000000 --- a/guile/starlet/fixture-library/chauvet/mav2/32chan.scm +++ /dev/null @@ -1,49 +0,0 @@ -;; -;; starlet/fixture-library/chauvet.scm -;; -;; Copyright © 2020-2021 Thomas White -;; -;; This file is part of Starlet. -;; -;; Starlet is free software: you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. -;; -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. -;; -;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see . -;; -(define-module (starlet fixture-library chauvet) - #:use-module (oop goops) - #:use-module (starlet fixture) - #:export ()) - - -(define-class () - (attributes - #:init-form (list - (attr-continuous 'intensity '(0 100) 0) - (attr-continuous 'pan '(0 540) 270) - (attr-continuous 'tilt '(0 270) 135) - (attr-continuous 'cyan '(0 100) 0) - (attr-continuous 'magenta '(0 100) 0) - (attr-continuous 'yellow '(0 100) 0)))) - - -(define-method (scanout-fixture (fixture ) - get-attr set-chan set-chan-16bit) - - (set-chan-16bit 1 (get-attr 'pan) 540) - (set-chan-16bit 3 (get-attr 'tilt) 270) - (set-chan-16bit 6 (get-attr 'intensity) 100) - - (set-chan 10 (percent->dmxval (get-attr 'cyan))) - (set-chan 11 (percent->dmxval (get-attr 'magenta))) - (set-chan 12 (percent->dmxval (get-attr 'yellow))) - - (set-chan 8 255)) diff --git a/guile/starlet/fixture-library/generic/any-rgb.scm b/guile/starlet/fixture-library/generic/any-rgb.scm deleted file mode 100644 index 1fc3fe2..0000000 --- a/guile/starlet/fixture-library/generic/any-rgb.scm +++ /dev/null @@ -1,62 +0,0 @@ -;; -;; starlet/fixture-library/generic/any-rgb.scm -;; -;; Copyright © 2020-2021 Thomas White -;; -;; This file is part of Starlet. -;; -;; Starlet is free software: you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. -;; -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. -;; -;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see . -;; -(define-module (starlet fixture-library generic any-rgb) - #:use-module (oop goops) - #:use-module (starlet fixture) - #:export (make-any-rgb)) - - -(define (chan->attr chan) - (attr-continuous chan '(0 100) 0)) - - -(define (make-any-rgb chans) - - (let ((new-class (make-class - (list ) - (list (cons 'attributes - (list #:init-thunk - (lambda () - (map chan->attr chans))))) - #:name 'generic-rgb))) - - (add-method! - scanout-fixture - (method ((fix new-class) get-attr set-chan8 set-chan16) - (for-each - - (lambda (chan offset) - - (cond - - ((eq? chan '0) - (set-chan8 offset 0)) - - ((eq? chan 'FL) - (set-chan8 offset 255)) - - (else (set-chan8 offset - (percent->dmxval8 - (get-attr chan)))))) - - chans (iota (length chans) 1)))) - - new-class)) diff --git a/guile/starlet/fixture-library/generic/rgb.scm b/guile/starlet/fixture-library/generic/rgb.scm index 6fa281d..4c2eb11 100644 --- a/guile/starlet/fixture-library/generic/rgb.scm +++ b/guile/starlet/fixture-library/generic/rgb.scm @@ -1,7 +1,7 @@ ;; ;; starlet/fixture-library/generic/rgb.scm ;; -;; Copyright © 2020-2021 Thomas White +;; Copyright © 2020-2022 Thomas White ;; ;; This file is part of Starlet. ;; @@ -19,21 +19,20 @@ ;; along with this program. If not, see . ;; (define-module (starlet fixture-library generic rgb) - #:use-module (oop goops) + #:use-module (starlet scanout) #:use-module (starlet fixture) + #:use-module (starlet utils) #:use-module (starlet colours) #:export ()) -(define-class () - (attributes - #:init-form (list - (attr-continuous 'intensity '(0 100) 0) - (attr-colour 'colour white)))) +(define-fixture + -(define-method (scanout-fixture (fixture ) - get-attr set-chan8 set-chan16) + (fixture-attributes + (attr-continuous 'intensity '(0 100) 0) + (attr-colour 'colour white)) (let ((intensity (get-attr 'intensity)) (rgb (colour-as-rgb (get-attr 'colour)))) diff --git a/guile/starlet/fixture-library/robe/mmxwashbeam.scm b/guile/starlet/fixture-library/robe/mmxwashbeam.scm new file mode 100644 index 0000000..282bd0f --- /dev/null +++ b/guile/starlet/fixture-library/robe/mmxwashbeam.scm @@ -0,0 +1,93 @@ +;; +;; starlet/fixture-library/robe/mmxwashbeam.scm +;; +;; Copyright © 2020-2022 Thomas White +;; +;; This file is part of Starlet. +;; +;; Starlet is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see . +;; +(define-module (starlet fixture-library robe mmxwashbeam) + #:use-module (starlet scanout) + #:use-module (starlet fixture) + #:use-module (starlet utils) + #:use-module (starlet colours) + #:export ()) + + +(define-fixture + + + + (fixture-attributes + (attr-continuous 'intensity '(0 100) 0) + (attr-continuous 'pan '(0 540) 270) + (attr-continuous 'tilt '(0 270) 135) + (attr-list 'strobe '(#t #f) #f) + (attr-list 'colwheel '(#f red blue orange green amber uv) #f) + (attr-list 'gobo '(#f iris gobo1 gobo2 gobo3 gobo4 gobo5 gobo6) #f) + (attr-list 'beamtype '(beam beamwash beamwashext) 'beam) + (attr-colour 'colour white) + (attr-continuous 'zoom '(0 100) 0) + (attr-continuous 'focus '(0 100) 0) + (attr-continuous 'barndoor-rot '(0 180) 90) + (attr-continuous 'barndoor1 '(0 180) 0) + (attr-continuous 'barndoor2 '(0 100) 0) + (attr-continuous 'barndoor3 '(0 100) 0) + (attr-continuous 'barndoor4 '(0 100) 0)) + + (set-chan16 33 (percent->dmxval16 (get-attr 'intensity))) + + (set-chan16 1 (scale-to-range (get-attr 'pan) '(0 540) '(0 65535))) + (set-chan16 3 (scale-to-range (get-attr 'tilt) '(0 270) '(0 65535))) + + (set-chan8 32 (if (get-attr 'strobe) 70 255)) + + (set-chan16 19 (percent->dmxval16 (get-attr 'zoom))) + (set-chan16 21 (percent->dmxval16 (get-attr 'focus))) + + ;;(set-chan 24 (number->dmxval (get-attr 'barndoor-rot) '(0 180))) + (set-chan8 25 (percent->dmxval8 (get-attr 'barndoor1))) + (set-chan8 26 (percent->dmxval8 (get-attr 'barndoor2))) + (set-chan8 27 (percent->dmxval8 (get-attr 'barndoor3))) + (set-chan8 28 (percent->dmxval8 (get-attr 'barndoor4))) + + (set-chan8 7 (assv-ref '((#f . 0) + (red . 18) + (blue . 37) + (orange . 55) + (green . 73) + (amber . 91) + (uv . 110)) + (get-attr 'colwheel))) + + (set-chan8 15 (assv-ref '((#f . 0) + (iris . 5) + (gobo1 . 10) + (gobo2 . 14) + (gobo3 . 18) + (gobo4 . 22) + (gobo5 . 26) + (gobo6 . 30)) + (get-attr 'gobo))) + + (set-chan8 18 (assv-ref '((beam . 0) + (beamwash . 35) + (beamwashext . 45)) + (get-attr 'beamtype))) + + (let ((cmy (colour-as-cmy (get-attr 'colour)))) + (set-chan8 9 (percent->dmxval8 (car cmy))) + (set-chan8 10 (percent->dmxval8 (cadr cmy))) + (set-chan8 11 (percent->dmxval8 (caddr cmy))))) diff --git a/guile/starlet/fixture-library/robe/mmxwashbeam/mode1.scm b/guile/starlet/fixture-library/robe/mmxwashbeam/mode1.scm deleted file mode 100644 index b412a24..0000000 --- a/guile/starlet/fixture-library/robe/mmxwashbeam/mode1.scm +++ /dev/null @@ -1,94 +0,0 @@ -;; -;; starlet/fixture-library/robe/mmxwashbeam/mode1.scm -;; -;; Copyright © 2020-2021 Thomas White -;; -;; This file is part of Starlet. -;; -;; Starlet is free software: you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. -;; -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. -;; -;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see . -;; -(define-module (starlet fixture-library robe mmxwashbeam mode1) - #:use-module (oop goops) - #:use-module (starlet fixture) - #:use-module (starlet colours) - #:export ()) - - -(define-class () - (attributes - #:init-form (list - (attr-continuous 'intensity '(0 100) 0) - (attr-continuous 'pan '(0 540) 270) - (attr-continuous 'tilt '(0 270) 135) - (attr-list 'strobe '(#t #f) #f) - (attr-list 'colwheel '(#f red blue orange green amber uv) #f) - (attr-list 'gobo '(#f iris gobo1 gobo2 gobo3 gobo4 gobo5 gobo6) #f) - (attr-list 'beamtype '(beam beamwash beamwashext) 'beam) - (attr-colour 'colour white) - (attr-continuous 'zoom '(0 100) 0) - (attr-continuous 'focus '(0 100) 0) - (attr-continuous 'barndoor-rot '(0 180) 90) - (attr-continuous 'barndoor1 '(0 180) 0) - (attr-continuous 'barndoor2 '(0 100) 0) - (attr-continuous 'barndoor3 '(0 100) 0) - (attr-continuous 'barndoor4 '(0 100) 0)))) - - -(define-method (scanout-fixture (fixture ) - get-attr set-chan8 set-chan16) - - (set-chan16 33 (percent->dmxval16 (get-attr 'intensity))) - - (set-chan16 1 (scale-to-range (get-attr 'pan) '(0 540) '(0 65535))) - (set-chan16 3 (scale-to-range (get-attr 'tilt) '(0 270) '(0 65535))) - - (set-chan8 32 (if (get-attr 'strobe) 70 255)) - - (set-chan16 19 (percent->dmxval16 (get-attr 'zoom))) - (set-chan16 21 (percent->dmxval16 (get-attr 'focus))) - - ;;(set-chan 24 (number->dmxval (get-attr 'barndoor-rot) '(0 180))) - (set-chan8 25 (percent->dmxval8 (get-attr 'barndoor1))) - (set-chan8 26 (percent->dmxval8 (get-attr 'barndoor2))) - (set-chan8 27 (percent->dmxval8 (get-attr 'barndoor3))) - (set-chan8 28 (percent->dmxval8 (get-attr 'barndoor4))) - - (set-chan8 7 (assv-ref '((#f . 0) - (red . 18) - (blue . 37) - (orange . 55) - (green . 73) - (amber . 91) - (uv . 110)) - (get-attr 'colwheel))) - - (set-chan8 15 (assv-ref '((#f . 0) - (iris . 5) - (gobo1 . 10) - (gobo2 . 14) - (gobo3 . 18) - (gobo4 . 22) - (gobo5 . 26) - (gobo6 . 30)) - (get-attr 'gobo))) - - (set-chan8 18 (assv-ref '((beam . 0) - (beamwash . 35) - (beamwashext . 45)) - (get-attr 'beamtype))) - - (let ((cmy (colour-as-cmy (get-attr 'colour)))) - (set-chan8 9 (percent->dmxval8 (car cmy))) - (set-chan8 10 (percent->dmxval8 (cadr cmy))) - (set-chan8 11 (percent->dmxval8 (caddr cmy))))) -- cgit v1.2.3