diff options
| -rw-r--r-- | desktop/sources/scripts/commander.js | 1 | ||||
| -rw-r--r-- | desktop/sources/scripts/cursor.js | 4 | ||||
| -rw-r--r-- | examples/chromatic.orca | 10 | ||||
| -rw-r--r-- | examples/double.orca | 31 | ||||
| -rw-r--r-- | examples/pendulum.orca | 17 | ||||
| -rw-r--r-- | examples/popcorn.orca | 11 | ||||
| -rw-r--r-- | examples/setup/sequencer.orca (renamed from examples/sequencer.orca) | 0 | ||||
| -rw-r--r-- | examples/setup/tracker.orca (renamed from examples/tracker.orca) | 0 | ||||
| -rw-r--r-- | examples/udp+loop.orca | 7 | ||||
| -rw-r--r-- | examples/wave.orca | 27 |
10 files changed, 46 insertions, 62 deletions
diff --git a/desktop/sources/scripts/commander.js b/desktop/sources/scripts/commander.js index c79ddbd..553270b 100644 --- a/desktop/sources/scripts/commander.js +++ b/desktop/sources/scripts/commander.js @@ -124,6 +124,7 @@ function Commander (terminal) { if (event.key === ' ' && terminal.cursor.mode === 0) { terminal.clock.togglePlay(); event.preventDefault(); return } if (event.key === 'Escape') { terminal.commander.stop(); terminal.clear(); terminal.isPaused = false; terminal.cursor.reset(); return } + if (event.key === 'Backspace') { terminal[this.isActive === true ? 'commander' : 'cursor'].erase(); event.preventDefault(); return } if (event.key === ']') { terminal.modGrid(1, 0); event.preventDefault(); return } if (event.key === '[') { terminal.modGrid(-1, 0); event.preventDefault(); return } diff --git a/desktop/sources/scripts/cursor.js b/desktop/sources/scripts/cursor.js index 69aea1e..5b6e130 100644 --- a/desktop/sources/scripts/cursor.js +++ b/desktop/sources/scripts/cursor.js @@ -92,10 +92,6 @@ function Cursor (terminal) { } this.erase = function (key) { - if (terminal.commander.isActive === true) { - terminal.commander.erase() - return - } this.eraseBlock(this.x, this.y, this.w, this.h) if (this.mode === 1) { this.move(-1, 0) } terminal.history.record(terminal.orca.s) diff --git a/examples/chromatic.orca b/examples/chromatic.orca index 9f05d5a..2b0f629 100644 --- a/examples/chromatic.orca +++ b/examples/chromatic.orca @@ -6,12 +6,12 @@ ..2lc0................................... ....JJ................................... ...Ic0................................... -...7cT*..........*....................... +...8cT*..........*....................... ...J..................................... -.H.7cTCcDdEFfGgAaB....................... -.*:03G................................... -.J...J................................... -.*:02G................................... +.H.8cTCcDdEFfGgAaB....................... +.*:03g................................... +......................................... +......................................... ......................................... ......................................... .........................................
\ No newline at end of file diff --git a/examples/double.orca b/examples/double.orca index b2cb03f..7f355b3 100644 --- a/examples/double.orca +++ b/examples/double.orca @@ -1,16 +1,17 @@ ......................................... -.#.DOUBLE.#.......................gC4.... -....................gC4.........21X3..... -.....................3.............J..... -...................1OJ............A33.... -.................1OA33.........21X6...... -...............1OA66..............J...... -.............1OAcc...............A66..... -...........1OAoo..............21Xc....... -.........1OAcc...................J....... -.......1OAoo....................Acc...... -.....1OAcc...................21Xo........ -...1OAno........................J........ -.1OA3b.........................Aoo....... -.Aee...........................c......... -.s....................................... +.#.DOUBLE.#.............................. +.....................gC4................. +......................1.................. +....................1OJ.................. +..................1OA11.................. +................1OA22.................... +..............1OA44...................... +............1OA88........................ +..........1OAGG.......................... +........1OAWW............................ +......1OASS.............................. +....1OAKK................................ +..1OA44.................................. +..A78.................................... +..F...................................... +.................................
\ No newline at end of file diff --git a/examples/pendulum.orca b/examples/pendulum.orca deleted file mode 100644 index cab0f27..0000000 --- a/examples/pendulum.orca +++ /dev/null @@ -1,17 +0,0 @@ -......................................... -.#.PENDULUM.#............................ -......................................... -......................................... -......................................... -............U........W.....U............. -....................J.................... -.....................B................... -......................H.................. -.....................xS.................. -......................................... -......................................... -......................................... -......................................... -......................................... -......................................... -.........................................
\ No newline at end of file diff --git a/examples/popcorn.orca b/examples/popcorn.orca index 5e17e74..18454ce 100644 --- a/examples/popcorn.orca +++ b/examples/popcorn.orca @@ -1,16 +1,17 @@ ......................................... .#.POPCORN.#............................. ......................................... -...C8.........8C4........................ -.2H68T13579bdf.16T2345................... -...xVb.........yV3....................... +..2C8.........gC4........................ +.2H38T13579bdf.16T2345................... +...xV7.........yV3....................... ......................................... ..2Kxy................................... -...Hb32Q................................. -...*:04d................................. +.D2.732Q................................. +..Y.:04G................................. ........#5C4a5C4G4d4G4C..#............... ........#5C4a5C4G4d4G4C..#............... ........#5C5D5d5D5d5C5D5C#............... ........#5D4a5C4a5C4g5C..#............... ......................................... +......................................... .........................................
\ No newline at end of file diff --git a/examples/sequencer.orca b/examples/setup/sequencer.orca index 79369e3..79369e3 100644 --- a/examples/sequencer.orca +++ b/examples/setup/sequencer.orca diff --git a/examples/tracker.orca b/examples/setup/tracker.orca index 96de51a..96de51a 100644 --- a/examples/tracker.orca +++ b/examples/setup/tracker.orca diff --git a/examples/udp+loop.orca b/examples/udp+loop.orca index 08135dd..26ed8f4 100644 --- a/examples/udp+loop.orca +++ b/examples/udp+loop.orca @@ -4,10 +4,11 @@ .#.SET.UDP.TO.49160.#.................... .#.SEND.WRITE.CMD.VIA.UDP.#.............. ......................................... -.#.TARGET:.#.1........................... +.#.TARGET:.#.9........................... +......................................... +.D4.4C................................... +..;w:013;6............................... ......................................... -.D44C.................................... -..;w213:6................................ ......................................... ......................................... ......................................... diff --git a/examples/wave.orca b/examples/wave.orca index 419e13f..03a579f 100644 --- a/examples/wave.orca +++ b/examples/wave.orca @@ -1,16 +1,17 @@ ......................................... -.#.WAVE.#...8C6...C4..................... -...........aV1..bV2...................... +.#.WAVE.#...8C6...C5..................... +...........aV0..bV2...................... .2Kab.................................... -..A12...........................:04F..... -..3XE...........................:04E..... -........E...E...................:04D..... -....E..E...E....................:04C..... -...E..E...E.....................:03B..... -.....E...E.....................*:03A..... -........................E...E..E:03G..... -................E...E..E...E..E.:03F..... -...............E...E..E...E..E..:03E..... -..............E...E..E...E......:03D..... -.............E...E..............:03C..... +..A02.................................... +..2XE.................................... +................................:04E..... +....E...........................:04D..... +...E..........................E.:04C..... +.........................E...E..:03B..... +...............E....E...E.......:03A..... +.....E....E...E....E...E....E..*:03G..... +.........E...E....E...E....E...E:03F..... +........E........E...E....E.....:03E..... +.......E....E...E...............:03D..... +......E....E....................:03C..... .........................................
\ No newline at end of file |