diff options
| author | Thomas White <taw@physics.org> | 2022-05-06 16:27:41 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2022-05-06 16:36:09 +0200 |
| commit | 4552ce9ecb3e49f1c54a52fd41375b2f9c40c9e8 (patch) | |
| tree | 58037d7402f5c168d404c0a0620dcfa93fcaee4a /guile/starlet/fixture-library/adj | |
| parent | 43d00c233d4bda38bc5882e7fe1ca2f37837fef2 (diff) | |
define-fixture: Eliminate need to provide names for get-attr etc
This needed some rearranging, but I think the resulting code is a little
bit more efficient.
Diffstat (limited to 'guile/starlet/fixture-library/adj')
| -rw-r--r-- | guile/starlet/fixture-library/adj/mega-tripar-profile.scm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/guile/starlet/fixture-library/adj/mega-tripar-profile.scm b/guile/starlet/fixture-library/adj/mega-tripar-profile.scm index 6f70d40..90a84f6 100644 --- a/guile/starlet/fixture-library/adj/mega-tripar-profile.scm +++ b/guile/starlet/fixture-library/adj/mega-tripar-profile.scm @@ -19,6 +19,7 @@ ;; along with this program. If not, see <http://www.gnu.org/licenses/>. ;; (define-module (starlet fixture-library adj mega-tripar-profile) + #:use-module (starlet scanout) #:use-module (starlet fixture) #:use-module (starlet utils) #:use-module (starlet colours) @@ -32,12 +33,10 @@ <adj-mega-tripar-profile-3ch> - (list + (fixture-attributes (attr-continuous 'intensity '(0 100) 0) (attr-colour 'colour white)) - (get-attr set-chan8) - (let ((intensity (/ (get-attr 'intensity) 100)) (rgb (colour-as-rgb (get-attr 'colour)))) (set-chan8 1 (percent->dmxval8 (* intensity (car rgb)))) @@ -51,12 +50,10 @@ <adj-mega-tripar-profile-4ch> - (list + (fixture-attributes (attr-continuous 'intensity '(0 100) 0) (attr-colour 'colour white)) - (get-attr set-chan8) - (let ((rgb (colour-as-rgb (get-attr 'colour)))) (set-chan8 1 (percent->dmxval8 (get-attr 'intensity))) (set-chan8 2 (percent->dmxval8 (car rgb))) |