ychernenko/WFL
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

поправил сброс инпутов на расстановках (убрал дублирование команд)

Browse Source
This commit is contained in:
Юрий Черненко
2026-05-15 12:00:03 +03:00
parent 9a61796f06
commit 4f1dc64d5d
1 changed files with 29 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
static/script.js
View File

@@ -2285,52 +2285,48 @@ function convertPitchYToPan(y) {
} }
// function buildVmixCommandsFromFormation(side) { // function buildVmixCommandsFromFormation(side) {
// const players = Array.isArray(formationState[side]) ? formationState[side] : []; // const players = Array.isArray(formationState[side]) ? formationState[side] : [];
// const inputName = getFormationVmixInputName(side);
// const commands = []; // const commands = [];
// const playerPrefix = side === "home" ? "HOME" : "AWAY"; // const playerPrefix = side === "home" ? "HOME" : "AWAY";
// const inputName = side === "home" ? "РАССТАНОВКА - ХОЗЯЕВА" : "РАССТАНОВКА - ГОСТИ";
// if (players.length < 2) { // if (players.length < 2) {
// return []; // return [];
// } // }
// // Сбрасываем только свою сторону
// for (let i = 1; i <= 10; i++) {
// commands.push(
// vmixCmd(`Function=ResetInput&Input=${encodeURIComponent(`${playerPrefix} - Игрок${i}`)}`)
// );
// }
// commands.push(
// vmixCmd(`Function=ResetInput&Input=${encodeURIComponent(inputName)}`)
// );
// // Вратарь players[0], полевые players[1..10] // // Вратарь players[0], полевые players[1..10]
// players.slice(1, 11).forEach((player, index) => { // players.slice(1, 11).forEach((player, index) => {
// const layer = index + 1; // const playerNumber = index + 1;
// const playerInputName = `${playerPrefix} - Игрок${playerNumber}`;
// const x = convertPitchXToPan(player.x).toFixed(3); // const x = convertPitchXToPan(player.x).toFixed(3);
// const y = convertPitchYToPan(player.y).toFixed(3); // const y = convertPitchYToPan(player.y).toFixed(3);
// for (let i = 1; i <= 10; i++) {
// commands.push( // commands.push(
// vmixCmd(`Function=SetLayer${layer}PanX&Input=${encodeURIComponent(inputName)}&Value=${x}`) // vmixCmd(`Function=ResetInput&Input=${encodeURIComponent(`${playerPrefix} - Игрок${i}`)}`)
// ); // );
// };
// commands.push( // commands.push(
// vmixCmd(`Function=SetLayer${layer}PanX&Input=${encodeURIComponent(inputName)}&Value=${x}`) // vmixCmd(`Function=ResetInput&Input=${encodeURIComponent(inputName)}`)
// );
// commands.push(
// vmixCmd(`Function=SetPanX&Input=${encodeURIComponent(playerInputName)}&Value=${x}`)
// ); // );
// commands.push( // commands.push(
// vmixCmd(`Function=SetLayer${layer}PanY&Input=${encodeURIComponent(inputName)}&Value=${y}`) // vmixCmd(`Function=SetPanY&Input=${encodeURIComponent(playerInputName)}&Value=${y}`)
// );
// commands.push(
// vmixCmd(`Function=SetLayer${layer}PanY&Input=${encodeURIComponent(inputName)}&Value=${y}`)
// ); // );
// }); // });
// commands.push(
// vmixCmd(`Function=PreviewInput&Input=${encodeURIComponent(inputName)}`)
// );
// return commands; // return commands;
// } // }
@@ -2340,12 +2336,20 @@ function buildVmixCommandsFromFormation(side) {
const playerPrefix = side === "home" ? "HOME" : "AWAY"; const playerPrefix = side === "home" ? "HOME" : "AWAY";
const inputName = side === "home" ? "РАССТАНОВКА - ХОЗЯЕВА" : "РАССТАНОВКА - ГОСТИ"; const inputName = side === "home" ? "РАССТАНОВКА - ХОЗЯЕВА" : "РАССТАНОВКА - ГОСТИ";
if (players.length < 2) { if (players.length < 2) {
return []; return [];
} }
// Вратарь players[0], полевые players[1..10] for (let i = 1; i <= 10; i++) {
commands.push(
vmixCmd(`Function=ResetInput&Input=${encodeURIComponent(`${playerPrefix} - Игрок${i}`)}`)
);
}
commands.push(
vmixCmd(`Function=ResetInput&Input=${encodeURIComponent(inputName)}`)
);
players.slice(1, 11).forEach((player, index) => { players.slice(1, 11).forEach((player, index) => {
const playerNumber = index + 1; const playerNumber = index + 1;
const playerInputName = `${playerPrefix} - Игрок${playerNumber}`; const playerInputName = `${playerPrefix} - Игрок${playerNumber}`;
@@ -2353,19 +2357,6 @@ function buildVmixCommandsFromFormation(side) {
const x = convertPitchXToPan(player.x).toFixed(3); const x = convertPitchXToPan(player.x).toFixed(3);
const y = convertPitchYToPan(player.y).toFixed(3); const y = convertPitchYToPan(player.y).toFixed(3);
for (let i = 1; i <= 10; i++) {
commands.push(
vmixCmd(`Function=ResetInput&Input=${encodeURIComponent(`${playerPrefix} - Игрок${i}`)}`)
);
};
commands.push(
vmixCmd(`Function=ResetInput&Input=${encodeURIComponent(inputName)}`)
);
commands.push( commands.push(
vmixCmd(`Function=SetPanX&Input=${encodeURIComponent(playerInputName)}&Value=${x}`) vmixCmd(`Function=SetPanX&Input=${encodeURIComponent(playerInputName)}&Value=${x}`)
); );