From dc035db886e201e580785650c623e2661c9cdb0e Mon Sep 17 00:00:00 2001 From: Egor Date: Fri, 29 Dec 2017 11:52:40 -0800 Subject: [PATCH] set the saturation to max during music syncing so it doesn't look dull in case the user messed with their saturation in another app --- web/app/pods/components/lights-tab/component.js | 2 +- web/app/pods/components/music-tab/component.js | 2 ++ web/app/pods/components/music-tab/mixins/helpers.js | 3 --- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/web/app/pods/components/lights-tab/component.js b/web/app/pods/components/lights-tab/component.js index ee98836..fd70ce6 100644 --- a/web/app/pods/components/lights-tab/component.js +++ b/web/app/pods/components/lights-tab/component.js @@ -311,7 +311,7 @@ export default Component.extend({ .velocity({ scale: 1 }, 100); this.get('activeLights').forEach(light => { - let options = { hue: Math.floor(Math.random() * 65535) }; + let options = { hue: Math.floor(Math.random() * 65535), sat: 254 }; if (this.get('lightsData')[light].state.on === false) { options.on = true; diff --git a/web/app/pods/components/music-tab/component.js b/web/app/pods/components/music-tab/component.js index a79edc6..2f45d58 100644 --- a/web/app/pods/components/music-tab/component.js +++ b/web/app/pods/components/music-tab/component.js @@ -130,6 +130,7 @@ export default Component.extend(helperMixin, visualizerMixin, { if (!isNone(hue)) { options.hue = hue; + options.sat = 254; } if (this.get('blackoutMode')) { @@ -601,6 +602,7 @@ export default Component.extend(helperMixin, visualizerMixin, { data: JSON.stringify({ on: preMusicLightsDataCache[lightIndex].state.on, hue: preMusicLightsDataCache[lightIndex].state.hue, + sat: preMusicLightsDataCache[lightIndex].state.sat, bri: preMusicLightsDataCache[lightIndex].state.bri }), contentType: 'application/json', diff --git a/web/app/pods/components/music-tab/mixins/helpers.js b/web/app/pods/components/music-tab/mixins/helpers.js index 31655c6..c77e73c 100644 --- a/web/app/pods/components/music-tab/mixins/helpers.js +++ b/web/app/pods/components/music-tab/mixins/helpers.js @@ -15,7 +15,6 @@ export default Mixin.create({ threshold: { range: { min: 0, max: 0.5 }, step: 0.01, - defaultValue: 0.3, pips: { mode: 'values', values: [0, 0.5], @@ -39,7 +38,6 @@ export default Mixin.create({ hueRange: { range: { min: 0, max: 65535 }, step: 1, - defaultValue: 0.3, pips: { mode: 'values', values: [0, 25500, 46920, 65535], @@ -65,7 +63,6 @@ export default Mixin.create({ brightnessRange: { range: { min: 1, max: 254 }, step: 1, - defaultValue: 0, pips: { mode: 'values', values: [1, 63, 127, 190, 254],