From 6f0279d8dfb9db1824b2a037569e17bb0d49659a Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 16 Jul 2019 21:36:23 +0200 Subject: Put all attribute values in a struct --- src/lightctx.h | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'src/lightctx.h') diff --git a/src/lightctx.h b/src/lightctx.h index 3084f50..ec9170a 100644 --- a/src/lightctx.h +++ b/src/lightctx.h @@ -97,15 +97,8 @@ struct fixture_class }; -struct fixture +struct attr_vals { - char *label; - int universe; - int base_addr; - struct fixture_class *cls; - - int flags; - float intensity; /* 0 (off) to 1 (full) */ float cyan; /* 0 (no filter) to 1 (full colour) */ float magenta; /* 0 (no filter) to 1 (full colour) */ @@ -125,6 +118,19 @@ struct fixture float zoom; /* 0 (narrowest) to 1 (widest) */ float frost; /* 0 (hardest) to 1 (softest) */ float iris; /* 0 (fully open) to 1 (fully closed) */ +}; + + +struct fixture +{ + char *label; + int universe; + int base_addr; + struct fixture_class *cls; + + int flags; + + struct attr_vals v; /* Values at start of mouse movement */ float pan_start; -- cgit v1.2.3