Implemented sound and lighting sliders

This commit is contained in:
2026-03-13 17:19:53 +01:00
parent 1ce7dfa057
commit 4e9651b08b
23 changed files with 461 additions and 34 deletions

View File

@@ -51,6 +51,8 @@ exports.CameraUnityStateColors = exports.UnityWebSocket = void 0;
var ws_1 = require("ws");
var Utils_1 = require("../Utils");
var Status_1 = require("../Status");
var path_1 = require("path");
var fs_extra_1 = require("fs-extra");
var PREFIX = '[Unity]';
var UnityWebSocket = /** @class */ (function () {
function UnityWebSocket(Main) {
@@ -67,6 +69,8 @@ var UnityWebSocket = /** @class */ (function () {
outOfService: null,
sliders: [],
advancedSliders: [],
dataSliders: [],
dataAdvancedSliders: [],
sensors: [],
};
this.disconnected = false;
@@ -90,6 +94,16 @@ var UnityWebSocket = /** @class */ (function () {
var advPercentage = args[1];
this.setAdvancedSliderValue(advSliderIndex, advPercentage);
break;
case 'dataParameterValue':
var dataSliderIndex = args[0];
var dataPercentage = args[1];
this.setDataSliderValue(dataSliderIndex, dataPercentage);
break;
case 'dataAdvancedParameterValue':
var dataAdvSliderIndex = args[0];
var dataAdvPercentage = args[1];
this.setDataAdvancedSliderValue(dataAdvSliderIndex, dataAdvPercentage);
break;
case 'enableOutOfService':
var enableCallback = args[0];
if (typeof enableCallback !== 'function')
@@ -126,6 +140,33 @@ var UnityWebSocket = /** @class */ (function () {
this.parameters.sliders[sliderIndex].outputValue = sliderValue;
this.broadcastState();
};
UnityWebSocket.prototype.setDataSliderValue = function (sliderIndex, sliderValue) {
if (this.socket == null || this.socket.readyState !== ws_1.WebSocket.OPEN)
return;
this.socket.send(JSON.stringify({
type: 'set_data_value',
sliderIndex: sliderIndex,
sliderValue: sliderValue,
}));
if (this.parameters.dataSliders[sliderIndex] == undefined)
return;
this.parameters.dataSliders[sliderIndex].outputValue = sliderValue;
this.broadcastState();
};
UnityWebSocket.prototype.setDataAdvancedSliderValue = function (sliderIndex, sliderValue) {
if (this.socket == null || this.socket.readyState !== ws_1.WebSocket.OPEN)
return;
this.socket.send(JSON.stringify({
type: 'set_data_advanced_value',
sliderIndex: sliderIndex,
sliderValue: sliderValue,
}));
if (this.parameters.dataAdvancedSliders[sliderIndex] == undefined)
return;
this.parameters.dataAdvancedSliders[sliderIndex].outputValue =
sliderValue;
this.broadcastState();
};
UnityWebSocket.prototype.setAdvancedSliderValue = function (sliderIndex, sliderValue) {
if (this.socket == null || this.socket.readyState !== ws_1.WebSocket.OPEN)
return;
@@ -194,13 +235,7 @@ var UnityWebSocket = /** @class */ (function () {
catch (error) {
return;
}
// writeFileSync(
// join(
// this._Main.dataPath,
// `tempdebug-${message.type}-${new Date().getTime()}.json`,
// ),
// JSON.stringify(message, null, 4),
// );
(0, fs_extra_1.writeFileSync)((0, path_1.join)(this._Main.dataPath, "tempdebug-".concat(message.type, "-").concat(new Date().getTime(), ".json")), JSON.stringify(message, null, 4));
switch (message.type) {
case 'heartbeat_data':
this.parameters.timelineWatching =

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

View File

@@ -5,7 +5,7 @@ var Calibration = /** @class */ (function () {
function Calibration(Main) {
this.visible = false;
this.container = document.querySelector('.ntsh-calibration');
this.image = this.container.querySelector('img');
this.image = this.container.querySelector('img.stream');
this._Main = Main;
this.registerListeners();
this.startClock();

View File

@@ -1 +1 @@
{"version":3,"file":"calibration.js","sourceRoot":"","sources":["../ts/calibration.ts"],"names":[],"mappings":";;;AAEA;IASC,qBAAY,IAAU;QALtB,YAAO,GAAY,KAAK,CAAC;QAEzB,cAAS,GAAmB,QAAQ,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC;QACxE,UAAK,GAAqB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAG7D,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAElB,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAEzB,IAAI,CAAC,UAAU,EAAE,CAAC;IACnB,CAAC;IAEO,gCAAU,GAAlB;QAAA,iBAKC;QAJA,WAAW,CAAC;YACX,IAAI,KAAI,CAAC,OAAO,IAAI,KAAI,CAAC,KAAK;gBAC7B,KAAI,CAAC,KAAK,CAAC,GAAG,GAAG,8BAAuB,IAAI,CAAC,GAAG,EAAE,CAAE,CAAC;QACvD,CAAC,EAAE,IAAI,CAAC,CAAC;IACV,CAAC;IAEO,uCAAiB,GAAzB;QAAA,iBAaC;QAZA,IAAI,CAAC,QAAQ,GAAG,IAAI,oBAAoB,CAAC,UAAC,OAAO;YAChD,OAAO,CAAC,OAAO,CAAC,UAAC,KAAK;gBACrB,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;oBAC1B,KAAI,CAAC,OAAO,GAAG,IAAI,CAAC;oBACpB,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;gBACpC,CAAC;qBAAM,CAAC;oBACP,KAAI,CAAC,OAAO,GAAG,KAAK,CAAC;oBACrB,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;gBACxC,CAAC;YACF,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvC,CAAC;IACF,kBAAC;AAAD,CAAC,AAtCD,IAsCC;AAtCY,kCAAW"}
{"version":3,"file":"calibration.js","sourceRoot":"","sources":["../ts/calibration.ts"],"names":[],"mappings":";;;AAEA;IASC,qBAAY,IAAU;QALtB,YAAO,GAAY,KAAK,CAAC;QAEzB,cAAS,GAAmB,QAAQ,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC;QACxE,UAAK,GAAqB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;QAGpE,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAElB,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAEzB,IAAI,CAAC,UAAU,EAAE,CAAC;IACnB,CAAC;IAEO,gCAAU,GAAlB;QAAA,iBAKC;QAJA,WAAW,CAAC;YACX,IAAI,KAAI,CAAC,OAAO,IAAI,KAAI,CAAC,KAAK;gBAC7B,KAAI,CAAC,KAAK,CAAC,GAAG,GAAG,8BAAuB,IAAI,CAAC,GAAG,EAAE,CAAE,CAAC;QACvD,CAAC,EAAE,IAAI,CAAC,CAAC;IACV,CAAC;IAEO,uCAAiB,GAAzB;QAAA,iBAaC;QAZA,IAAI,CAAC,QAAQ,GAAG,IAAI,oBAAoB,CAAC,UAAC,OAAO;YAChD,OAAO,CAAC,OAAO,CAAC,UAAC,KAAK;gBACrB,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;oBAC1B,KAAI,CAAC,OAAO,GAAG,IAAI,CAAC;oBACpB,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;gBACpC,CAAC;qBAAM,CAAC;oBACP,KAAI,CAAC,OAAO,GAAG,KAAK,CAAC;oBACrB,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;gBACxC,CAAC;YACF,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvC,CAAC;IACF,kBAAC;AAAD,CAAC,AAtCD,IAsCC;AAtCY,kCAAW"}

View File

@@ -7,7 +7,35 @@ var Lighting = /** @class */ (function () {
this.exposureInput = document.querySelector('.ntsh_lightingsettings-exposure');
this.whiteBalanceInput = document.querySelector('.ntsh_lightingsettings-whitebalance');
this._Main = Main;
this.registerListeners();
}
Lighting.prototype.update = function (state) {
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
if (((_a = state === null || state === void 0 ? void 0 : state.parameters) === null || _a === void 0 ? void 0 : _a.dataAdvancedSliders) == null)
return;
var gainSliderIndex = (_b = state.parameters) === null || _b === void 0 ? void 0 : _b.dataAdvancedSliders.findIndex(function (slider) { return slider.sliderName === 'Gain'; });
var gainSlider = (_c = state.parameters) === null || _c === void 0 ? void 0 : _c.dataAdvancedSliders[gainSliderIndex !== null && gainSliderIndex !== void 0 ? gainSliderIndex : -1];
var exposureSliderIndex = (_d = state.parameters) === null || _d === void 0 ? void 0 : _d.dataAdvancedSliders.findIndex(function (slider) { return slider.sliderName === 'Exposure'; });
var exposureSlider = (_e = state.parameters) === null || _e === void 0 ? void 0 : _e.dataAdvancedSliders[exposureSliderIndex !== null && exposureSliderIndex !== void 0 ? exposureSliderIndex : -1];
var whiteBalanceSliderIndex = (_f = state.parameters) === null || _f === void 0 ? void 0 : _f.dataAdvancedSliders.findIndex(function (slider) { return slider.sliderName === 'WhiteBalance'; });
var whiteBalanceSlider = (_g = state.parameters) === null || _g === void 0 ? void 0 : _g.dataAdvancedSliders[whiteBalanceSliderIndex !== null && whiteBalanceSliderIndex !== void 0 ? whiteBalanceSliderIndex : -1];
this.gainInput.valueAsNumber =
(_h = gainSlider === null || gainSlider === void 0 ? void 0 : gainSlider.outputValue) !== null && _h !== void 0 ? _h : this.gainInput.valueAsNumber;
this.exposureInput.valueAsNumber =
(_j = exposureSlider === null || exposureSlider === void 0 ? void 0 : exposureSlider.outputValue) !== null && _j !== void 0 ? _j : this.exposureInput.valueAsNumber;
this.whiteBalanceInput.valueAsNumber =
(_k = whiteBalanceSlider === null || whiteBalanceSlider === void 0 ? void 0 : whiteBalanceSlider.outputValue) !== null && _k !== void 0 ? _k : this.whiteBalanceInput.valueAsNumber;
this.gainInput.setAttribute('index', (_l = gainSliderIndex === null || gainSliderIndex === void 0 ? void 0 : gainSliderIndex.toString()) !== null && _l !== void 0 ? _l : '-1');
this.exposureInput.setAttribute('index', (_m = exposureSliderIndex === null || exposureSliderIndex === void 0 ? void 0 : exposureSliderIndex.toString()) !== null && _m !== void 0 ? _m : '-1');
this.whiteBalanceInput.setAttribute('index', (_o = whiteBalanceSliderIndex === null || whiteBalanceSliderIndex === void 0 ? void 0 : whiteBalanceSliderIndex.toString()) !== null && _o !== void 0 ? _o : '-1');
};
Lighting.prototype.registerListeners = function () {
var _this = this;
this.gainInput.onchange = function () {
var _a;
_this._Main.socket.emit('unityWebSocket', 'dataAdvancedParameterValue', parseInt((_a = _this.gainInput.getAttribute('index')) !== null && _a !== void 0 ? _a : '-1'), _this.gainInput.valueAsNumber);
};
};
return Lighting;
}());
exports.Lighting = Lighting;

View File

@@ -1 +1 @@
{"version":3,"file":"lighting.js","sourceRoot":"","sources":["../ts/lighting.ts"],"names":[],"mappings":";;;AAEA;IAaC,kBAAY,IAAU;QAVtB,cAAS,GAAqB,QAAQ,CAAC,aAAa,CACnD,6BAA6B,CAC7B,CAAC;QACF,kBAAa,GAAqB,QAAQ,CAAC,aAAa,CACvD,iCAAiC,CACjC,CAAC;QACF,sBAAiB,GAAqB,QAAQ,CAAC,aAAa,CAC3D,qCAAqC,CACrC,CAAC;QAGD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACnB,CAAC;IACF,eAAC;AAAD,CAAC,AAhBD,IAgBC;AAhBY,4BAAQ"}
{"version":3,"file":"lighting.js","sourceRoot":"","sources":["../ts/lighting.ts"],"names":[],"mappings":"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"}

View File

@@ -76,6 +76,8 @@ var Main = /** @class */ (function () {
(_b = (_a = state === null || state === void 0 ? void 0 : state.parameters) === null || _a === void 0 ? void 0 : _a.outOfService) !== null && _b !== void 0 ? _b : false;
_this.OutOfServiceMode.state =
(_d = (_c = state === null || state === void 0 ? void 0 : state.parameters) === null || _c === void 0 ? void 0 : _c.outOfService) !== null && _d !== void 0 ? _d : false;
_this.Lighting.update(state);
_this.Sound.update(state);
});
socket.on('timer', function (data) {
_this.Timer.update(data);

View File

@@ -1 +1 @@
{"version":3,"file":"main.js","sourceRoot":"","sources":["../ts/main.ts"],"names":[],"mappings":"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"}
{"version":3,"file":"main.js","sourceRoot":"","sources":["../ts/main.ts"],"names":[],"mappings":"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"}

View File

@@ -8,7 +8,52 @@ var Sound = /** @class */ (function () {
this.eqMidInput = document.querySelector('.ntsh_soundsettings-eqmid');
this.eqHighInput = document.querySelector('.ntsh_soundsettings-eqhigh');
this._Main = Main;
this.registerListeners();
}
Sound.prototype.update = function (state) {
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
if (((_a = state === null || state === void 0 ? void 0 : state.parameters) === null || _a === void 0 ? void 0 : _a.dataSliders) == null)
return;
var volumeSliderIndex = (_b = state.parameters) === null || _b === void 0 ? void 0 : _b.dataSliders.findIndex(function (slider) { return slider.sliderName === 'Volume'; });
var volumeSlider = (_c = state.parameters) === null || _c === void 0 ? void 0 : _c.dataSliders[volumeSliderIndex !== null && volumeSliderIndex !== void 0 ? volumeSliderIndex : -1];
var eqLowSliderIndex = (_d = state.parameters) === null || _d === void 0 ? void 0 : _d.dataSliders.findIndex(function (slider) { return slider.sliderName === 'EQ_Low'; });
var eqLowSlider = (_e = state.parameters) === null || _e === void 0 ? void 0 : _e.dataSliders[eqLowSliderIndex !== null && eqLowSliderIndex !== void 0 ? eqLowSliderIndex : -1];
var eqMidSliderIndex = (_f = state.parameters) === null || _f === void 0 ? void 0 : _f.dataSliders.findIndex(function (slider) { return slider.sliderName === 'EQ_Mid'; });
var eqMidSlider = (_g = state.parameters) === null || _g === void 0 ? void 0 : _g.dataSliders[eqMidSliderIndex !== null && eqMidSliderIndex !== void 0 ? eqMidSliderIndex : -1];
var eqHighSliderIndex = (_h = state.parameters) === null || _h === void 0 ? void 0 : _h.dataSliders.findIndex(function (slider) { return slider.sliderName === 'EQ_High'; });
var eqHighSlider = (_j = state.parameters) === null || _j === void 0 ? void 0 : _j.dataSliders[eqHighSliderIndex !== null && eqHighSliderIndex !== void 0 ? eqHighSliderIndex : -1];
this.volumeInput.valueAsNumber =
(_k = volumeSlider === null || volumeSlider === void 0 ? void 0 : volumeSlider.outputValue) !== null && _k !== void 0 ? _k : this.volumeInput.valueAsNumber;
this.eqLowInput.valueAsNumber =
(_l = eqLowSlider === null || eqLowSlider === void 0 ? void 0 : eqLowSlider.outputValue) !== null && _l !== void 0 ? _l : this.eqLowInput.valueAsNumber;
this.eqMidInput.valueAsNumber =
(_m = eqMidSlider === null || eqMidSlider === void 0 ? void 0 : eqMidSlider.outputValue) !== null && _m !== void 0 ? _m : this.eqMidInput.valueAsNumber;
this.eqHighInput.valueAsNumber =
(_o = eqHighSlider === null || eqHighSlider === void 0 ? void 0 : eqHighSlider.outputValue) !== null && _o !== void 0 ? _o : this.eqHighInput.valueAsNumber;
this.volumeInput.setAttribute('index', (_p = volumeSliderIndex === null || volumeSliderIndex === void 0 ? void 0 : volumeSliderIndex.toString()) !== null && _p !== void 0 ? _p : '-1');
this.eqLowInput.setAttribute('index', (_q = eqLowSliderIndex === null || eqLowSliderIndex === void 0 ? void 0 : eqLowSliderIndex.toString()) !== null && _q !== void 0 ? _q : '-1');
this.eqMidInput.setAttribute('index', (_r = eqMidSliderIndex === null || eqMidSliderIndex === void 0 ? void 0 : eqMidSliderIndex.toString()) !== null && _r !== void 0 ? _r : '-1');
this.eqHighInput.setAttribute('index', (_s = eqHighSliderIndex === null || eqHighSliderIndex === void 0 ? void 0 : eqHighSliderIndex.toString()) !== null && _s !== void 0 ? _s : '-1');
};
Sound.prototype.registerListeners = function () {
var _this = this;
this.volumeInput.onchange = function () {
var _a;
_this._Main.socket.emit('unityWebSocket', 'dataParameterValue', parseInt((_a = _this.volumeInput.getAttribute('index')) !== null && _a !== void 0 ? _a : '-1'), _this.volumeInput.valueAsNumber);
};
this.eqLowInput.onchange = function () {
var _a;
_this._Main.socket.emit('unityWebSocket', 'dataParameterValue', parseInt((_a = _this.eqLowInput.getAttribute('index')) !== null && _a !== void 0 ? _a : '-1'), _this.eqLowInput.valueAsNumber);
};
this.eqMidInput.onchange = function () {
var _a;
_this._Main.socket.emit('unityWebSocket', 'dataParameterValue', parseInt((_a = _this.eqMidInput.getAttribute('index')) !== null && _a !== void 0 ? _a : '-1'), _this.eqMidInput.valueAsNumber);
};
this.eqHighInput.onchange = function () {
var _a;
_this._Main.socket.emit('unityWebSocket', 'dataParameterValue', parseInt((_a = _this.eqHighInput.getAttribute('index')) !== null && _a !== void 0 ? _a : '-1'), _this.eqHighInput.valueAsNumber);
};
};
return Sound;
}());
exports.Sound = Sound;

View File

@@ -1 +1 @@
{"version":3,"file":"sound.js","sourceRoot":"","sources":["../ts/sound.ts"],"names":[],"mappings":";;;AAEA;IAgBC,eAAY,IAAU;QAbtB,gBAAW,GAAqB,QAAQ,CAAC,aAAa,CACrD,4BAA4B,CAC5B,CAAC;QACF,eAAU,GAAqB,QAAQ,CAAC,aAAa,CACpD,2BAA2B,CAC3B,CAAC;QACF,eAAU,GAAqB,QAAQ,CAAC,aAAa,CACpD,2BAA2B,CAC3B,CAAC;QACF,gBAAW,GAAqB,QAAQ,CAAC,aAAa,CACrD,4BAA4B,CAC5B,CAAC;QAGD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACnB,CAAC;IACF,YAAC;AAAD,CAAC,AAnBD,IAmBC;AAnBY,sBAAK"}
{"version":3,"file":"sound.js","sourceRoot":"","sources":["../ts/sound.ts"],"names":[],"mappings":"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"}

View File

@@ -167,7 +167,8 @@
</h3>
<div class="ntsh-calibration">
<img src="/calibrationImage">
<img class="stream" src="/calibrationImage">
<img class="mask" src="/img/calibrationMask.png">
</div>
<h1 style="margin-bottom:30px;">Thank you for checking! :)</h1>
@@ -252,22 +253,26 @@
<div class="ntsh_soundsettings-row">
<h4>Volume</h4>
<input class="ntsh_soundsettings-volume" type="range" min="0" max="100" value="0">
<input class="ntsh_soundsettings-volume" type="range" min="0" max="1" value="0"
step="0.01">
</div>
<div class="ntsh_soundsettings-row">
<h4>EQ low</h4>
<input class="ntsh_soundsettings-eqlow" type="range" min="-100" max="100" value="0">
<input class="ntsh_soundsettings-eqlow" type="range" min="0" max="1" value="0"
step="0.01">
</div>
<div class="ntsh_soundsettings-row">
<h4>EQ mid</h4>
<input class="ntsh_soundsettings-eqmid" type="range" min="-100" max="100" value="0">
<input class="ntsh_soundsettings-eqmid" type="range" min="0" max="1" value="0"
step="0.01">
</div>
<div class="ntsh_soundsettings-row">
<h4>EQ high</h4>
<input class="ntsh_soundsettings-eqhigh" type="range" min="-100" max="100" value="0">
<input class="ntsh_soundsettings-eqhigh" type="range" min="0" max="1" value="0"
step="0.01">
</div>
</div>

View File

@@ -14609,7 +14609,7 @@
function Calibration(Main) {
this.visible = false;
this.container = document.querySelector('.ntsh-calibration');
this.image = this.container.querySelector('img');
this.image = this.container.querySelector('img.stream');
this._Main = Main;
this.registerListeners();
this.startClock();
@@ -14751,7 +14751,35 @@
this.exposureInput = document.querySelector('.ntsh_lightingsettings-exposure');
this.whiteBalanceInput = document.querySelector('.ntsh_lightingsettings-whitebalance');
this._Main = Main;
this.registerListeners();
}
Lighting.prototype.update = function (state) {
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
if (((_a = state === null || state === void 0 ? void 0 : state.parameters) === null || _a === void 0 ? void 0 : _a.dataAdvancedSliders) == null)
return;
var gainSliderIndex = (_b = state.parameters) === null || _b === void 0 ? void 0 : _b.dataAdvancedSliders.findIndex(function (slider) { return slider.sliderName === 'Gain'; });
var gainSlider = (_c = state.parameters) === null || _c === void 0 ? void 0 : _c.dataAdvancedSliders[gainSliderIndex !== null && gainSliderIndex !== void 0 ? gainSliderIndex : -1];
var exposureSliderIndex = (_d = state.parameters) === null || _d === void 0 ? void 0 : _d.dataAdvancedSliders.findIndex(function (slider) { return slider.sliderName === 'Exposure'; });
var exposureSlider = (_e = state.parameters) === null || _e === void 0 ? void 0 : _e.dataAdvancedSliders[exposureSliderIndex !== null && exposureSliderIndex !== void 0 ? exposureSliderIndex : -1];
var whiteBalanceSliderIndex = (_f = state.parameters) === null || _f === void 0 ? void 0 : _f.dataAdvancedSliders.findIndex(function (slider) { return slider.sliderName === 'WhiteBalance'; });
var whiteBalanceSlider = (_g = state.parameters) === null || _g === void 0 ? void 0 : _g.dataAdvancedSliders[whiteBalanceSliderIndex !== null && whiteBalanceSliderIndex !== void 0 ? whiteBalanceSliderIndex : -1];
this.gainInput.valueAsNumber =
(_h = gainSlider === null || gainSlider === void 0 ? void 0 : gainSlider.outputValue) !== null && _h !== void 0 ? _h : this.gainInput.valueAsNumber;
this.exposureInput.valueAsNumber =
(_j = exposureSlider === null || exposureSlider === void 0 ? void 0 : exposureSlider.outputValue) !== null && _j !== void 0 ? _j : this.exposureInput.valueAsNumber;
this.whiteBalanceInput.valueAsNumber =
(_k = whiteBalanceSlider === null || whiteBalanceSlider === void 0 ? void 0 : whiteBalanceSlider.outputValue) !== null && _k !== void 0 ? _k : this.whiteBalanceInput.valueAsNumber;
this.gainInput.setAttribute('index', (_l = gainSliderIndex === null || gainSliderIndex === void 0 ? void 0 : gainSliderIndex.toString()) !== null && _l !== void 0 ? _l : '-1');
this.exposureInput.setAttribute('index', (_m = exposureSliderIndex === null || exposureSliderIndex === void 0 ? void 0 : exposureSliderIndex.toString()) !== null && _m !== void 0 ? _m : '-1');
this.whiteBalanceInput.setAttribute('index', (_o = whiteBalanceSliderIndex === null || whiteBalanceSliderIndex === void 0 ? void 0 : whiteBalanceSliderIndex.toString()) !== null && _o !== void 0 ? _o : '-1');
};
Lighting.prototype.registerListeners = function () {
var _this = this;
this.gainInput.onchange = function () {
var _a;
_this._Main.socket.emit('unityWebSocket', 'dataAdvancedParameterValue', parseInt((_a = _this.gainInput.getAttribute('index')) !== null && _a !== void 0 ? _a : '-1'), _this.gainInput.valueAsNumber);
};
};
return Lighting;
}());
lighting.Lighting = Lighting;
@@ -14767,7 +14795,52 @@
this.eqMidInput = document.querySelector('.ntsh_soundsettings-eqmid');
this.eqHighInput = document.querySelector('.ntsh_soundsettings-eqhigh');
this._Main = Main;
this.registerListeners();
}
Sound.prototype.update = function (state) {
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
if (((_a = state === null || state === void 0 ? void 0 : state.parameters) === null || _a === void 0 ? void 0 : _a.dataSliders) == null)
return;
var volumeSliderIndex = (_b = state.parameters) === null || _b === void 0 ? void 0 : _b.dataSliders.findIndex(function (slider) { return slider.sliderName === 'Volume'; });
var volumeSlider = (_c = state.parameters) === null || _c === void 0 ? void 0 : _c.dataSliders[volumeSliderIndex !== null && volumeSliderIndex !== void 0 ? volumeSliderIndex : -1];
var eqLowSliderIndex = (_d = state.parameters) === null || _d === void 0 ? void 0 : _d.dataSliders.findIndex(function (slider) { return slider.sliderName === 'EQ_Low'; });
var eqLowSlider = (_e = state.parameters) === null || _e === void 0 ? void 0 : _e.dataSliders[eqLowSliderIndex !== null && eqLowSliderIndex !== void 0 ? eqLowSliderIndex : -1];
var eqMidSliderIndex = (_f = state.parameters) === null || _f === void 0 ? void 0 : _f.dataSliders.findIndex(function (slider) { return slider.sliderName === 'EQ_Mid'; });
var eqMidSlider = (_g = state.parameters) === null || _g === void 0 ? void 0 : _g.dataSliders[eqMidSliderIndex !== null && eqMidSliderIndex !== void 0 ? eqMidSliderIndex : -1];
var eqHighSliderIndex = (_h = state.parameters) === null || _h === void 0 ? void 0 : _h.dataSliders.findIndex(function (slider) { return slider.sliderName === 'EQ_High'; });
var eqHighSlider = (_j = state.parameters) === null || _j === void 0 ? void 0 : _j.dataSliders[eqHighSliderIndex !== null && eqHighSliderIndex !== void 0 ? eqHighSliderIndex : -1];
this.volumeInput.valueAsNumber =
(_k = volumeSlider === null || volumeSlider === void 0 ? void 0 : volumeSlider.outputValue) !== null && _k !== void 0 ? _k : this.volumeInput.valueAsNumber;
this.eqLowInput.valueAsNumber =
(_l = eqLowSlider === null || eqLowSlider === void 0 ? void 0 : eqLowSlider.outputValue) !== null && _l !== void 0 ? _l : this.eqLowInput.valueAsNumber;
this.eqMidInput.valueAsNumber =
(_m = eqMidSlider === null || eqMidSlider === void 0 ? void 0 : eqMidSlider.outputValue) !== null && _m !== void 0 ? _m : this.eqMidInput.valueAsNumber;
this.eqHighInput.valueAsNumber =
(_o = eqHighSlider === null || eqHighSlider === void 0 ? void 0 : eqHighSlider.outputValue) !== null && _o !== void 0 ? _o : this.eqHighInput.valueAsNumber;
this.volumeInput.setAttribute('index', (_p = volumeSliderIndex === null || volumeSliderIndex === void 0 ? void 0 : volumeSliderIndex.toString()) !== null && _p !== void 0 ? _p : '-1');
this.eqLowInput.setAttribute('index', (_q = eqLowSliderIndex === null || eqLowSliderIndex === void 0 ? void 0 : eqLowSliderIndex.toString()) !== null && _q !== void 0 ? _q : '-1');
this.eqMidInput.setAttribute('index', (_r = eqMidSliderIndex === null || eqMidSliderIndex === void 0 ? void 0 : eqMidSliderIndex.toString()) !== null && _r !== void 0 ? _r : '-1');
this.eqHighInput.setAttribute('index', (_s = eqHighSliderIndex === null || eqHighSliderIndex === void 0 ? void 0 : eqHighSliderIndex.toString()) !== null && _s !== void 0 ? _s : '-1');
};
Sound.prototype.registerListeners = function () {
var _this = this;
this.volumeInput.onchange = function () {
var _a;
_this._Main.socket.emit('unityWebSocket', 'dataParameterValue', parseInt((_a = _this.volumeInput.getAttribute('index')) !== null && _a !== void 0 ? _a : '-1'), _this.volumeInput.valueAsNumber);
};
this.eqLowInput.onchange = function () {
var _a;
_this._Main.socket.emit('unityWebSocket', 'dataParameterValue', parseInt((_a = _this.eqLowInput.getAttribute('index')) !== null && _a !== void 0 ? _a : '-1'), _this.eqLowInput.valueAsNumber);
};
this.eqMidInput.onchange = function () {
var _a;
_this._Main.socket.emit('unityWebSocket', 'dataParameterValue', parseInt((_a = _this.eqMidInput.getAttribute('index')) !== null && _a !== void 0 ? _a : '-1'), _this.eqMidInput.valueAsNumber);
};
this.eqHighInput.onchange = function () {
var _a;
_this._Main.socket.emit('unityWebSocket', 'dataParameterValue', parseInt((_a = _this.eqHighInput.getAttribute('index')) !== null && _a !== void 0 ? _a : '-1'), _this.eqHighInput.valueAsNumber);
};
};
return Sound;
}());
sound.Sound = Sound;
@@ -14849,6 +14922,8 @@
(_b = (_a = state === null || state === void 0 ? void 0 : state.parameters) === null || _a === void 0 ? void 0 : _a.outOfService) !== null && _b !== void 0 ? _b : false;
_this.OutOfServiceMode.state =
(_d = (_c = state === null || state === void 0 ? void 0 : state.parameters) === null || _c === void 0 ? void 0 : _c.outOfService) !== null && _d !== void 0 ? _d : false;
_this.Lighting.update(state);
_this.Sound.update(state);
});
socket.on('timer', function (data) {
_this.Timer.update(data);

File diff suppressed because one or more lines are too long

View File

@@ -41,10 +41,21 @@
}
.ntsh-calibration {
position: relative;
width: 100%;
margin: 30px 0px;
overflow: hidden;
img {
img.stream {
width: 200%;
clip-path: inset(0px 0px 0px 50%);
margin-left: -100%;
}
img.mask {
position: absolute;
top: 0px;
left: 0px;
width: 100%;
}
}

View File

@@ -2587,10 +2587,20 @@ input:checked + .slider:before {
}
.ntsh-calibration {
position: relative;
width: 100%;
margin: 30px 0px;
overflow: hidden;
}
.ntsh-calibration img {
.ntsh-calibration img.stream {
width: 200%;
clip-path: inset(0px 0px 0px 50%);
margin-left: -100%;
}
.ntsh-calibration img.mask {
position: absolute;
top: 0px;
left: 0px;
width: 100%;
}

File diff suppressed because one or more lines are too long

View File

@@ -7,7 +7,7 @@ export class Calibration {
visible: boolean = false;
container: HTMLDivElement = document.querySelector('.ntsh-calibration');
image: HTMLImageElement = this.container.querySelector('img');
image: HTMLImageElement = this.container.querySelector('img.stream');
constructor(Main: Main) {
this._Main = Main;

View File

@@ -1,4 +1,4 @@
import { Main } from './main';
import { Main, UnityWebSocketStatus } from './main';
export class Lighting {
private _Main: Main;
@@ -15,5 +15,65 @@ export class Lighting {
constructor(Main: Main) {
this._Main = Main;
this.registerListeners();
}
update(state: UnityWebSocketStatus) {
if (state?.parameters?.dataAdvancedSliders == null) return;
const gainSliderIndex = state.parameters?.dataAdvancedSliders.findIndex(
(slider) => slider.sliderName === 'Gain',
);
const gainSlider =
state.parameters?.dataAdvancedSliders[gainSliderIndex ?? -1];
const exposureSliderIndex =
state.parameters?.dataAdvancedSliders.findIndex(
(slider) => slider.sliderName === 'Exposure',
);
const exposureSlider =
state.parameters?.dataAdvancedSliders[exposureSliderIndex ?? -1];
const whiteBalanceSliderIndex =
state.parameters?.dataAdvancedSliders.findIndex(
(slider) => slider.sliderName === 'WhiteBalance',
);
const whiteBalanceSlider =
state.parameters?.dataAdvancedSliders[
whiteBalanceSliderIndex ?? -1
];
this.gainInput.valueAsNumber =
gainSlider?.outputValue ?? this.gainInput.valueAsNumber;
this.exposureInput.valueAsNumber =
exposureSlider?.outputValue ?? this.exposureInput.valueAsNumber;
this.whiteBalanceInput.valueAsNumber =
whiteBalanceSlider?.outputValue ??
this.whiteBalanceInput.valueAsNumber;
this.gainInput.setAttribute(
'index',
gainSliderIndex?.toString() ?? '-1',
);
this.exposureInput.setAttribute(
'index',
exposureSliderIndex?.toString() ?? '-1',
);
this.whiteBalanceInput.setAttribute(
'index',
whiteBalanceSliderIndex?.toString() ?? '-1',
);
}
private registerListeners() {
this.gainInput.onchange = () => {
this._Main.socket.emit(
'unityWebSocket',
'dataAdvancedParameterValue',
parseInt(this.gainInput.getAttribute('index') ?? '-1'),
this.gainInput.valueAsNumber,
);
};
}
}

View File

@@ -44,6 +44,9 @@ export class Main {
state?.parameters?.outOfService ?? false;
this.OutOfServiceMode.state =
state?.parameters?.outOfService ?? false;
this.Lighting.update(state);
this.Sound.update(state);
});
socket.on('timer', (data) => {
@@ -119,7 +122,7 @@ export type ServiceState =
| 'DISCONNECTED'
| 'FAILED';
interface UnityWebSocketStatus {
export interface UnityWebSocketStatus {
state: ServiceState;
message?: string;
error?: string;
@@ -137,6 +140,8 @@ interface UnityParameters {
outOfService: boolean;
sliders: UnityParameterSlider[];
advancedSliders: UnityParameterSlider[];
dataSliders: UnityParameterSlider[];
dataAdvancedSliders: UnityParameterSlider[];
sensors: UnitySocketMessageHeartbeat['heartbeat']['dataSensors'];
}

View File

@@ -1,4 +1,4 @@
import { Main } from './main';
import { Main, UnityWebSocketStatus } from './main';
export class Sound {
private _Main: Main;
@@ -18,5 +18,99 @@ export class Sound {
constructor(Main: Main) {
this._Main = Main;
this.registerListeners();
}
update(state: UnityWebSocketStatus) {
if (state?.parameters?.dataSliders == null) return;
const volumeSliderIndex = state.parameters?.dataSliders.findIndex(
(slider) => slider.sliderName === 'Volume',
);
const volumeSlider =
state.parameters?.dataSliders[volumeSliderIndex ?? -1];
const eqLowSliderIndex = state.parameters?.dataSliders.findIndex(
(slider) => slider.sliderName === 'EQ_Low',
);
const eqLowSlider =
state.parameters?.dataSliders[eqLowSliderIndex ?? -1];
const eqMidSliderIndex = state.parameters?.dataSliders.findIndex(
(slider) => slider.sliderName === 'EQ_Mid',
);
const eqMidSlider =
state.parameters?.dataSliders[eqMidSliderIndex ?? -1];
const eqHighSliderIndex = state.parameters?.dataSliders.findIndex(
(slider) => slider.sliderName === 'EQ_High',
);
const eqHighSlider =
state.parameters?.dataSliders[eqHighSliderIndex ?? -1];
this.volumeInput.valueAsNumber =
volumeSlider?.outputValue ?? this.volumeInput.valueAsNumber;
this.eqLowInput.valueAsNumber =
eqLowSlider?.outputValue ?? this.eqLowInput.valueAsNumber;
this.eqMidInput.valueAsNumber =
eqMidSlider?.outputValue ?? this.eqMidInput.valueAsNumber;
this.eqHighInput.valueAsNumber =
eqHighSlider?.outputValue ?? this.eqHighInput.valueAsNumber;
this.volumeInput.setAttribute(
'index',
volumeSliderIndex?.toString() ?? '-1',
);
this.eqLowInput.setAttribute(
'index',
eqLowSliderIndex?.toString() ?? '-1',
);
this.eqMidInput.setAttribute(
'index',
eqMidSliderIndex?.toString() ?? '-1',
);
this.eqHighInput.setAttribute(
'index',
eqHighSliderIndex?.toString() ?? '-1',
);
}
private registerListeners() {
this.volumeInput.onchange = () => {
this._Main.socket.emit(
'unityWebSocket',
'dataParameterValue',
parseInt(this.volumeInput.getAttribute('index') ?? '-1'),
this.volumeInput.valueAsNumber,
);
};
this.eqLowInput.onchange = () => {
this._Main.socket.emit(
'unityWebSocket',
'dataParameterValue',
parseInt(this.eqLowInput.getAttribute('index') ?? '-1'),
this.eqLowInput.valueAsNumber,
);
};
this.eqMidInput.onchange = () => {
this._Main.socket.emit(
'unityWebSocket',
'dataParameterValue',
parseInt(this.eqMidInput.getAttribute('index') ?? '-1'),
this.eqMidInput.valueAsNumber,
);
};
this.eqHighInput.onchange = () => {
this._Main.socket.emit(
'unityWebSocket',
'dataParameterValue',
parseInt(this.eqHighInput.getAttribute('index') ?? '-1'),
this.eqHighInput.valueAsNumber,
);
};
}
}

View File

@@ -25,6 +25,8 @@ export class UnityWebSocket {
outOfService: null,
sliders: [],
advancedSliders: [],
dataSliders: [],
dataAdvancedSliders: [],
sensors: [],
};
@@ -52,6 +54,23 @@ export class UnityWebSocket {
this.setAdvancedSliderValue(advSliderIndex, advPercentage);
break;
case 'dataParameterValue':
const dataSliderIndex: number = args[0];
const dataPercentage: number = args[1];
this.setDataSliderValue(dataSliderIndex, dataPercentage);
break;
case 'dataAdvancedParameterValue':
const dataAdvSliderIndex: number = args[0];
const dataAdvPercentage: number = args[1];
this.setDataAdvancedSliderValue(
dataAdvSliderIndex,
dataAdvPercentage,
);
break;
case 'enableOutOfService':
const enableCallback: Function = args[0];
if (typeof enableCallback !== 'function') return;
@@ -100,6 +119,42 @@ export class UnityWebSocket {
this.broadcastState();
}
setDataSliderValue(sliderIndex: number, sliderValue: number) {
if (this.socket == null || this.socket.readyState !== WebSocket.OPEN)
return;
this.socket.send(
JSON.stringify({
type: 'set_data_value',
sliderIndex,
sliderValue,
}),
);
if (this.parameters.dataSliders[sliderIndex] == undefined) return;
this.parameters.dataSliders[sliderIndex].outputValue = sliderValue;
this.broadcastState();
}
setDataAdvancedSliderValue(sliderIndex: number, sliderValue: number) {
if (this.socket == null || this.socket.readyState !== WebSocket.OPEN)
return;
this.socket.send(
JSON.stringify({
type: 'set_data_advanced_value',
sliderIndex,
sliderValue,
}),
);
if (this.parameters.dataAdvancedSliders[sliderIndex] == undefined)
return;
this.parameters.dataAdvancedSliders[sliderIndex].outputValue =
sliderValue;
this.broadcastState();
}
setAdvancedSliderValue(sliderIndex: number, sliderValue: number) {
if (this.socket == null || this.socket.readyState !== WebSocket.OPEN)
return;
@@ -191,13 +246,13 @@ export class UnityWebSocket {
return;
}
// writeFileSync(
// join(
// this._Main.dataPath,
// `tempdebug-${message.type}-${new Date().getTime()}.json`,
// ),
// JSON.stringify(message, null, 4),
// );
writeFileSync(
join(
this._Main.dataPath,
`tempdebug-${message.type}-${new Date().getTime()}.json`,
),
JSON.stringify(message, null, 4),
);
switch (message.type) {
case 'heartbeat_data':
@@ -408,6 +463,8 @@ interface UnityParameters {
zedFPS: string;
outOfService: boolean;
sliders: UnityParameterSlider[];
dataSliders: UnityParameterSlider[];
dataAdvancedSliders: UnityParameterSlider[];
advancedSliders: UnityParameterSlider[];
sensors: UnitySocketMessageHeartbeat['heartbeat']['dataSensors'];
}