aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorneauoire <[email protected]>2019-11-27 10:54:40 -0500
committerneauoire <[email protected]>2019-11-27 10:54:40 -0500
commit2bcf3bdc69a2b06bd59f3b9b79803805c41b0d6d (patch)
treef2ca16af40f684fd38029a063e51fa2ec7cade99
parent308722337b066329587befce0051b878d23d4b7c (diff)
downloadOrca-2bcf3bdc69a2b06bd59f3b9b79803805c41b0d6d.tar.gz
Orca-2bcf3bdc69a2b06bd59f3b9b79803805c41b0d6d.zip
Fixed issue with alt drag
-rw-r--r--README.md3
-rw-r--r--desktop/sources/links/main.css4
-rw-r--r--desktop/sources/scripts/client.js2
-rw-r--r--desktop/sources/scripts/commander.js8
-rw-r--r--desktop/sources/scripts/cursor.js2
-rw-r--r--sw.js2
6 files changed, 13 insertions, 8 deletions
diff --git a/README.md b/README.md
index 533f9f4..7cc7b4f 100644
--- a/README.md
+++ b/README.md
@@ -137,7 +137,7 @@ All commands have a shorthand equivalent to their first two characters, for exam
- `run` Runs current frame.
- `bpm:140` Sets bpm speed to `140`.
- `apm:160` Animates bpm speed to `160`.
-- `time:0` Sets the frame value to `0`.
+- `frame:0` Sets the frame value to `0`.
- `skip:2` Adds `2`, to the current frame value.
- `rewind:2` Removes `2`, to the current frame value.
- `color:f00;0f0;00f` Colorizes the interface.
@@ -145,6 +145,7 @@ All commands have a shorthand equivalent to their first two characters, for exam
- `select:3;4;5;6` Move cursor to position `3,4`, and select size `5:6`(optional).
- `inject:pattern;12;34` Inject the local file `pattern.orca`, at `12,34`(optional).
- `write:H;12;34` Writes glyph `H`, at `12,34`(optional).
+- `time` Prints the time, in minutes seconds, since `0f`.
## Base36 Table
diff --git a/desktop/sources/links/main.css b/desktop/sources/links/main.css
index 4db9c84..186c581 100644
--- a/desktop/sources/links/main.css
+++ b/desktop/sources/links/main.css
@@ -9,9 +9,9 @@
/* Main */
body { font-family: 'input_mono_medium'; padding:30px; overflow: hidden; -webkit-app-region: drag; transition: background-color 500ms; background-size: cover; background-position: center center; max-height: calc(100% - 60px); }
-canvas { display: block;white-space: pre;font-size: 11px;line-height: 10px; text-transform: uppercase; width:300px; opacity: 0;-webkit-app-region: no-drag; transition: opacity 1000ms; }
+canvas { display: block;white-space: pre;font-size: 11px;line-height: 10px; text-transform: uppercase; width:300px; opacity: 0;-webkit-app-region: no-drag; transition: opacity 1000ms; image-rendering: pixelated; image-rendering: optimizeSpeed; }
canvas.ready { opacity: 1; }
/* Theme */
-body { background-color:var(--background) !important; }
+body { background-color:var(--background) !important; } \ No newline at end of file
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)
}
diff --git a/sw.js b/sw.js
index d22f792..14998f5 100644
--- a/sw.js
+++ b/sw.js
@@ -1,4 +1,4 @@
-// 159
+// 160
const assets = [
'./',