Fixed advanced sliders

This commit is contained in:
2026-03-15 21:31:01 +01:00
parent 7686341107
commit 43544ea6d5
40 changed files with 374 additions and 298 deletions

View File

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
});
};
var __generator = (this && this.__generator) || function (thisArg, body) {
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
function verb(n) { return function (v) { return step([n, v]); }; }
function step(op) {
if (f) throw new TypeError("Generator is already executing.");
@@ -181,9 +181,9 @@ var UnityRunner = /** @class */ (function () {
});
});
};
UnityRunner.prototype.restart = function (origin, instant) {
if (instant === void 0) { instant = false; }
return __awaiter(this, void 0, void 0, function () {
UnityRunner.prototype.restart = function (origin_1) {
return __awaiter(this, arguments, void 0, function (origin, instant) {
if (instant === void 0) { instant = false; }
return __generator(this, function (_a) {
switch (_a.label) {
case 0:
@@ -233,10 +233,10 @@ var UnityRunner = /** @class */ (function () {
});
};
UnityRunner.prototype.start = function (origin) {
var _a, _b, _c;
return __awaiter(this, void 0, void 0, function () {
var path, fileName;
var _this = this;
var _a, _b, _c;
return __generator(this, function (_d) {
switch (_d.label) {
case 0:

File diff suppressed because one or more lines are too long

View File

@@ -20,8 +20,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
});
};
var __generator = (this && this.__generator) || function (thisArg, body) {
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
function verb(n) { return function (v) { return step([n, v]); }; }
function step(op) {
if (f) throw new TypeError("Generator is already executing.");
@@ -67,8 +67,8 @@ var UnityWebSocket = /** @class */ (function () {
outOfService: null,
sliders: [],
advancedSliders: [],
dataSliders: [],
dataAdvancedSliders: [],
// dataSliders: [],
// dataAdvancedSliders: [],
sensors: [],
};
this.disconnected = false;
@@ -92,16 +92,19 @@ 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 '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':
var enableCallback = args[0];
if (typeof enableCallback !== 'function')
@@ -138,33 +141,6 @@ 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;
@@ -178,6 +154,36 @@ var UnityWebSocket = /** @class */ (function () {
this.parameters.advancedSliders[sliderIndex].outputValue = sliderValue;
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();
// }
UnityWebSocket.prototype.setOutOfService = function (state) {
if (this.socket == null || this.socket.readyState !== ws_1.WebSocket.OPEN)
return;
@@ -274,7 +280,6 @@ var UnityWebSocket = /** @class */ (function () {
case 'timeline_update':
var playbackReady = message.value == 1;
this._Main.Status.update(Status_1.StatusType.ReplayFunction, playbackReady ? Status_1.State.Green : Status_1.State.Yellow, playbackReady ? 'Playback ready' : 'Playback not ready');
console.log('timeline_update', message);
break;
case 'response_camera_frame':
this._Main.WebServer.Calibration.writeCalibrationImage(message.imageBase64);

File diff suppressed because one or more lines are too long