versão 2.0

This commit is contained in:
JotaChina committed 2025-10-20 21:53:09 -03:00
1 parent d506332268
commit fe735bf0a6
16 files changed
+1735 -1626

No files matched your search

+51 -72
View File
@@ -1,13 +1,9 @@
// js/file.js
import { appState, loadAudioForTrack } from "./state.js";
import { getTotalSteps } from "./utils.js";
import { renderApp, getSamplePathMap } from "./ui.js";
import { DEFAULT_PAN, DEFAULT_VOLUME, NOTE_LENGTH, TICKS_PER_BAR } from "./config.js";
import {
initializeAudioContext,
getAudioContext,
getMainGainNode,
} from "./audio.js";
import { appState, resetProjectState } from "./state.js";
import { loadAudioForTrack } from "./pattern/pattern_state.js";
import { renderAll, getSamplePathMap } from "./ui.js";
import { DEFAULT_PAN, DEFAULT_VOLUME, NOTE_LENGTH } from "./config.js";
import { initializeAudioContext, getAudioContext, getMainGainNode } from "./audio.js";
export async function handleFileLoad(file) {
let xmlContent = "";
@@ -31,12 +27,31 @@ export async function handleFileLoad(file) {
}
}
export async function loadProjectFromServer(fileName) {
try {
const response = await fetch(`mmp/${fileName}`);
if (!response.ok)
throw new Error(`Não foi possível carregar o arquivo ${fileName}`);
const xmlContent = await response.text();
await parseMmpContent(xmlContent);
return true;
} catch (error) {
console.error("Erro ao carregar projeto do servidor:", error);
console.error(error);
alert(`Erro ao carregar projeto: ${error.message}`);
return false;
}
}
export async function parseMmpContent(xmlString) {
resetProjectState();
initializeAudioContext();
const parser = new DOMParser();
const xmlDoc = parser.parseFromString(xmlString, "application/xml");
appState.originalXmlDoc = xmlDoc;
appState.global.originalXmlDoc = xmlDoc;
let newTracks = [];
const head = xmlDoc.querySelector("head");
@@ -48,25 +63,27 @@ export async function parseMmpContent(xmlString) {
const allBBTrackNodes = Array.from(xmlDoc.querySelectorAll('song > trackcontainer[type="song"] > track[type="1"]'));
if (allBBTrackNodes.length === 0) {
appState.tracks = []; renderApp(); return;
appState.pattern.tracks = [];
renderAll();
return;
}
// --- INÍCIO DA CORREÇÃO FINAL DE ORDENAÇÃO ---
// A lista de NOMES é ordenada em ordem CRESCENTE (a ordem correta, cronológica).
const sortedBBTrackNameNodes = [...allBBTrackNodes].sort((a, b) => {
const bbtcoA = a.querySelector('bbtco');
const bbtcoB = b.querySelector('bbtco');
const posA = bbtcoA ? parseInt(bbtcoA.getAttribute('pos'), 10) : Infinity;
const posB = bbtcoB ? parseInt(bbtcoB.getAttribute('pos'), 10) : Infinity;
return posA - posB; // Ordem crescente
return posA - posB;
});
const dataSourceTrack = allBBTrackNodes[0];
appState.currentBeatBasslineName = dataSourceTrack.getAttribute("name") || "Beat/Bassline";
appState.global.currentBeatBasslineName = dataSourceTrack.getAttribute("name") || "Beat/Bassline";
const bbTrackContainer = dataSourceTrack.querySelector('bbtrack > trackcontainer');
if (!bbTrackContainer) {
appState.tracks = []; renderApp(); return;
appState.pattern.tracks = [];
renderAll();
return;
}
const instrumentTracks = bbTrackContainer.querySelectorAll('track[type="0"]');
@@ -84,13 +101,11 @@ export async function parseMmpContent(xmlString) {
}
const allPatternsNodeList = trackNode.querySelectorAll("pattern");
// A lista de CONTEÚDO dos patterns é ordenada de forma DECRESCENTE para corresponder.
const allPatternsArray = Array.from(allPatternsNodeList).sort((a, b) => {
const posA = parseInt(a.getAttribute('pos'), 10) || 0;
const posB = parseInt(b.getAttribute('pos'), 10) || 0;
return posB - posA; // Ordem decrescente
return posB - posA;
});
// --- FIM DA CORREÇÃO FINAL DE ORDENAÇÃO ---
const patterns = sortedBBTrackNameNodes.map((bbTrack, index) => {
const patternNode = allPatternsArray[index];
@@ -159,13 +174,15 @@ export async function parseMmpContent(xmlString) {
let isFirstTrackWithNotes = true;
newTracks.forEach(track => {
const audioContext = getAudioContext();
track.gainNode = audioContext.createGain();
track.pannerNode = audioContext.createStereoPanner();
// --- INÍCIO DA CORREÇÃO ---
// Cria os nós de áudio usando os construtores do Tone.js
track.gainNode = new Tone.Gain(Tone.gainToDb(track.volume));
track.pannerNode = new Tone.Panner(track.pan);
// Conecta a cadeia de áudio: Gain -> Panner -> Saída Principal (Destination)
track.gainNode.connect(track.pannerNode);
track.pannerNode.connect(getMainGainNode());
track.gainNode.gain.value = track.volume;
track.pannerNode.pan.value = track.pan;
// --- FIM DA CORREÇÃO ---
if (isFirstTrackWithNotes) {
const activeIdx = track.activePatternIndex || 0;
@@ -187,13 +204,13 @@ export async function parseMmpContent(xmlString) {
console.error("Ocorreu um erro ao carregar os áudios do projeto:", error);
}
appState.tracks = newTracks;
appState.activeTrackId = appState.tracks[0]?.id || null;
renderApp();
appState.pattern.tracks = newTracks;
appState.pattern.activeTrackId = appState.pattern.tracks[0]?.id || null;
renderAll();
}
export function generateMmpFile() {
if (appState.originalXmlDoc) {
if (appState.global.originalXmlDoc) {
modifyAndSaveExistingMmp();
} else {
generateNewMmp();
@@ -202,11 +219,9 @@ export function generateMmpFile() {
function createTrackXml(track) {
if (track.patterns.length === 0) return "";
const ticksPerStep = 12;
const lmmsVolume = Math.round(track.volume * 100);
const lmmsPan = Math.round(track.pan * 100);
const patternsXml = track.patterns.map(pattern => {
const patternNotes = pattern.steps.map((isActive, index) => {
if (isActive) {
@@ -215,12 +230,10 @@ function createTrackXml(track) {
}
return "";
}).join("\n ");
return `<pattern type="0" pos="${pattern.pos}" muted="0" steps="${pattern.steps.length}" name="${pattern.name}">
${patternNotes}
</pattern>`;
}).join('\n ');
return `
<track type="0" solo="0" muted="0" name="${track.name}">
<instrumenttrack vol="${lmmsVolume}" pitch="0" fxch="0" pitchrange="1" basenote="57" usemasterpitch="1" pan="${lmmsPan}">
@@ -235,39 +248,23 @@ function createTrackXml(track) {
function modifyAndSaveExistingMmp() {
console.log("Modificando arquivo .mmp existente...");
const xmlDoc = appState.originalXmlDoc.cloneNode(true);
const xmlDoc = appState.global.originalXmlDoc.cloneNode(true);
const head = xmlDoc.querySelector("head");
if (head) {
head.setAttribute("bpm", document.getElementById("bpm-input").value);
head.setAttribute("num_bars", document.getElementById("bars-input").value);
head.setAttribute(
"timesig_numerator",
document.getElementById("compasso-a-input").value
);
head.setAttribute(
"timesig_denominator",
document.getElementById("compasso-b-input").value
);
head.setAttribute("timesig_numerator", document.getElementById("compasso-a-input").value);
head.setAttribute("timesig_denominator", document.getElementById("compasso-b-input").value);
}
const bbTrackContainer = xmlDoc.querySelector('track[type="1"] > bbtrack > trackcontainer');
if (bbTrackContainer) {
bbTrackContainer.querySelectorAll('track[type="0"]').forEach(node => node.remove());
const tracksXml = appState.tracks
.map((track) => createTrackXml(track))
.join("");
const tempDoc = new DOMParser().parseFromString(
`<root>${tracksXml}</root>`,
"application/xml"
);
const tracksXml = appState.pattern.tracks.map((track) => createTrackXml(track)).join("");
const tempDoc = new DOMParser().parseFromString(`<root>${tracksXml}</root>`, "application/xml");
Array.from(tempDoc.documentElement.children).forEach((newTrackNode) => {
bbTrackContainer.appendChild(newTrackNode);
});
}
const serializer = new XMLSerializer();
const mmpContent = serializer.serializeToString(xmlDoc);
downloadFile(mmpContent, "projeto_editado.mmp");
@@ -278,10 +275,7 @@ function generateNewMmp() {
const sig_num = document.getElementById("compasso-a-input").value;
const sig_den = document.getElementById("compasso-b-input").value;
const num_bars = document.getElementById("bars-input").value;
const tracksXml = appState.tracks
.map((track) => createTrackXml(track))
.join("");
const tracksXml = appState.pattern.tracks.map((track) => createTrackXml(track)).join("");
const mmpContent = `<?xml version="1.0"?>
<!DOCTYPE lmms-project>
<lmms-project version="1.0" type="song" creator="MMPCreator" creatorversion="1.0">
@@ -320,19 +314,4 @@ function downloadFile(content, fileName) {
a.click();
document.body.removeChild(a);
URL.revokeObjectURL(url);
}
export async function loadProjectFromServer(fileName) {
try {
const response = await fetch(`mmp/${fileName}`);
if (!response.ok)
throw new Error(`Não foi possível carregar o arquivo ${fileName}`);
const xmlContent = await response.text();
await parseMmpContent(xmlContent);
return true;
} catch (error) {
console.error("Erro ao carregar projeto do servidor:", error);
alert(`Erro ao carregar projeto: ${error.message}`);
return false;
}
}