16mm
/
mcopy
1
0
Fork 0
Code Issues 14 Pull Requests Projects 2 Releases 13 Wiki Activity

Fix the toSequence function which actually sends a compiled mscript script to the sequencer. Yay.

This commit is contained in:
mmcw-dev 2018-03-15 14:52:41 -04:00
parent c128fa2871
commit a2ab93bd46
1 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
app/lib/ui/mscript.js
View File

@ -35,7 +35,8 @@ mse.mscript.fromSequence = function () {
let str; let str;
let tmp = []; let tmp = [];
let cont; let cont;
str = mcopy.state.sequence.arr.join('\n'); //quick hack //str = mcopy.state.sequence.arr.join('\n'); //quick hack
console.dir(mcopy.state.sequence);
for (let cmd of mcopy.state.sequence.arr) { for (let cmd of mcopy.state.sequence.arr) {
if (tmp.length > 0 && tmp[tmp.length - 1].cmd === cmd) { if (tmp.length > 0 && tmp[tmp.length - 1].cmd === cmd) {
tmp[tmp.length - 1].num++; tmp[tmp.length - 1].num++;
@ -52,9 +53,45 @@ mse.mscript.fromSequence = function () {
if (cont) { if (cont) {
mse.mscript.editor.getDoc().setValue(str); mse.mscript.editor.getDoc().setValue(str);
} }
}; };
mse.mscript.toGUI = function () {
'use strict';
let c;
for (let i = 0; i < mse.mscript.data.arr.length; i++) {
c = mse.mscript.data.arr[i];
mcopy.state.sequence.arr[i] = c;
//if (c === 'CF' || c === 'CB') {
mcopy.state.sequence.light[i] = light.color.join(',');
//} else {
//mcopy.state.sequence.light[i] = '';
//}
gui.grid.state(i);
}
};
mse.mscript.toSequence = function () {
'use strict';
const data = mse.mscript.editor.getValue();
let cont;
if (data !== mse.mscript.raw) {
cont = confirm(`Current script has not been compiled. Compile first?`);
if (cont) {
return mse.mscript.compile(() => {
mse.console.print(`Sending compiled script to GUI sequencer...`);
seq.clear();
mse.mscript.toGUI();
gui.grid.refresh();
seq.stats();
return nav.change('sequencer');
})
}
}
mse.console.print(`Sending compiled script to GUI sequencer...`);
seq.clear();
mse.mscript.toGUI();
gui.grid.refresh();
seq.stats();
return nav.change('sequencer');
}
mse.mscript.compile = function (cb) { mse.mscript.compile = function (cb) {
'use strict'; 'use strict';
const data = mse.mscript.editor.getValue(); const data = mse.mscript.editor.getValue();