frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

Option to layout by entertainment area center

Browse Source
This commit is contained in:
LordGrey 2023-09-10 21:38:30 +02:00
parent 77139027cf
commit 4afc8bc94a
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/webconfig/i18n/en.json
View File

@ -87,6 +87,7 @@
"conf_leds_layout_cl_cornergap": "Corner Gap", "conf_leds_layout_cl_cornergap": "Corner Gap",
"conf_leds_layout_cl_edgegap": "Edge Gap", "conf_leds_layout_cl_edgegap": "Edge Gap",
"conf_leds_layout_cl_entertainment": "Entertainment Area", "conf_leds_layout_cl_entertainment": "Entertainment Area",
"conf_leds_layout_cl_entertainment_center": "Entertainment Area Center",
"conf_leds_layout_cl_gaglength": "Gap length", "conf_leds_layout_cl_gaglength": "Gap length",
"conf_leds_layout_cl_gappos": "gap position", "conf_leds_layout_cl_gappos": "gap position",
"conf_leds_layout_cl_hleddepth": "Horizontal LED depth", "conf_leds_layout_cl_hleddepth": "Horizontal LED depth",

38
assets/webconfig/js/wizard.js
View File

@ -1152,12 +1152,31 @@ function beginWizardHue() {
createHueUser(); createHueUser();
}); });
function assignLightEntertainmentPos(position, name, id) { function assignLightEntertainmentPos(isFocusCenter, position, name, id) {
var x = position.x; var x = position.x;
var z = position.z; var z = position.z;
var h = (x + 1) / 2;
var v = (-z + 1) / 2; if (isFocusCenter) {
// Map lights as in centered range -0.5 to 0.5
if (x < -0.5) {
x = -0.5;
} else if (x > 0.5) {
x = 0.5;
}
if (z < -0.5) {
z = -0.5;
} else if (z > 0.5) {
z = 0.5;
}
} else {
// Map lights as in full range -1 to 1
x /= 2;
z /= 2;
}
var h = x + 0.5;
var v = -z + 0.5;
var hmin = h - 0.05; var hmin = h - 0.05;
var hmax = h + 0.05; var hmax = h + 0.05;
@ -1256,19 +1275,25 @@ function beginWizardHue() {
serviceID = lightLocation.service.rid; serviceID = lightLocation.service.rid;
} }
if (position === "entertainment") { if (position.startsWith("entertainment")) {
// Layout per entertainment area definition at bridge // Layout per entertainment area definition at bridge
var isFocusCenter = false;
if (position === "entertainment_center") {
isFocusCenter = true;
}
if (isAPIv2Ready) { if (isAPIv2Ready) {
groupChannels.forEach((channel) => { groupChannels.forEach((channel) => {
if (channel.members[0].service.rid === serviceID) { if (channel.members[0].service.rid === serviceID) {
var layoutObject = assignLightEntertainmentPos(channel.position, lightName, channel.channel_id); var layoutObject = assignLightEntertainmentPos(isFocusCenter, channel.position, lightName, channel.channel_id);
hueLedConfig.push(JSON.parse(JSON.stringify(layoutObject))); hueLedConfig.push(JSON.parse(JSON.stringify(layoutObject)));
++channelNumber; ++channelNumber;
} }
}); });
} else { } else {
var layoutObject = assignLightEntertainmentPos(lightLocation.position, lightName); var layoutObject = assignLightEntertainmentPos(isFocusCenter, lightLocation.position, lightName);
hueLedConfig.push(JSON.parse(JSON.stringify(layoutObject))); hueLedConfig.push(JSON.parse(JSON.stringify(layoutObject)));
} }
} }
@ -1529,6 +1554,7 @@ function get_hue_lights(username) {
]; ];
if (isEntertainmentReady) { if (isEntertainmentReady) {
lightOptions.unshift("entertainment_center");
lightOptions.unshift("entertainment"); lightOptions.unshift("entertainment");
} else { } else {
lightOptions.unshift("disabled"); lightOptions.unshift("disabled");