diff options
author | neauoire <[email protected]> | 2019-11-27 10:54:40 -0500 |
---|---|---|
committer | neauoire <[email protected]> | 2019-11-27 10:54:40 -0500 |
commit | 2bcf3bdc69a2b06bd59f3b9b79803805c41b0d6d (patch) | |
tree | f2ca16af40f684fd38029a063e51fa2ec7cade99 /desktop/sources/scripts | |
parent | 308722337b066329587befce0051b878d23d4b7c (diff) | |
download | Orca-2bcf3bdc69a2b06bd59f3b9b79803805c41b0d6d.tar.gz Orca-2bcf3bdc69a2b06bd59f3b9b79803805c41b0d6d.zip |
Fixed issue with alt drag
Diffstat (limited to 'desktop/sources/scripts')
-rw-r--r-- | desktop/sources/scripts/client.js | 2 | ||||
-rw-r--r-- | desktop/sources/scripts/commander.js | 8 | ||||
-rw-r--r-- | desktop/sources/scripts/cursor.js | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/desktop/sources/scripts/client.js b/desktop/sources/scripts/client.js index 882576f..0c51308 100644 --- a/desktop/sources/scripts/client.js +++ b/desktop/sources/scripts/client.js @@ -12,7 +12,7 @@ /* global Theme */ function Client () { - this.version = 159 + this.version = 160 this.library = library this.theme = new Theme(this) diff --git a/desktop/sources/scripts/commander.js b/desktop/sources/scripts/commander.js index 88da285..43739e2 100644 --- a/desktop/sources/scripts/commander.js +++ b/desktop/sources/scripts/commander.js @@ -36,12 +36,16 @@ function Commander (client) { play: (p) => { client.clock.play() }, stop: (p) => { client.clock.stop() }, run: (p) => { client.run() }, - // Speed + // Time apm: (p) => { client.clock.setSpeed(null, p.int) }, bpm: (p) => { client.clock.setSpeed(p.int, p.int, true) }, - time: (p) => { client.clock.setFrame(p.int) }, + frame: (p) => { client.clock.setFrame(p.int) }, rewind: (p) => { client.clock.setFrame(client.orca.f - p.int) }, skip: (p) => { client.clock.setFrame(client.orca.f + p.int) }, + time: (p, origin) => { + const formatted = new Date(250 * (client.orca.f * (60 / client.clock.speed.value))).toISOString().substr(14, 5).replace(/:/g, '') + client.orca.writeBlock(origin ? origin.x : client.cursor.x, origin ? origin.y : client.cursor.y, [`${formatted}`]) + }, // Themeing color: (p) => { if (p.parts[0]) { client.theme.set('b_low', p.parts[0]) } diff --git a/desktop/sources/scripts/cursor.js b/desktop/sources/scripts/cursor.js index f5891c1..3c85540 100644 --- a/desktop/sources/scripts/cursor.js +++ b/desktop/sources/scripts/cursor.js @@ -131,7 +131,7 @@ function Cursor (client) { } this.writeBlock = (block, overlap = false) => { - client.orca.writeBlock(this.x, this.y, block, overlap) + client.orca.writeBlock(this.minX, this.minY, block, overlap) client.history.record(client.orca.s) } |