diff options
author | neauoire <[email protected]> | 2020-02-05 10:32:58 -0500 |
---|---|---|
committer | neauoire <[email protected]> | 2020-02-05 10:32:58 -0500 |
commit | bce64c0cfa827c054300181085de74d9594ece97 (patch) | |
tree | c0c3a1c27c8ee7047916b7c5a02846b52a70556b | |
parent | e7e401dbb7cdd36d11400339b722cb037dab2c5d (diff) | |
download | Orca-bce64c0cfa827c054300181085de74d9594ece97.tar.gz Orca-bce64c0cfa827c054300181085de74d9594ece97.zip |
Added MANUAL.txt
-rw-r--r-- | README.md | 7 | ||||
-rw-r--r-- | desktop/icon.svg | 14 | ||||
-rw-r--r-- | desktop/package.json | 2 | ||||
-rw-r--r-- | desktop/sources/scripts/client.js | 2 | ||||
-rw-r--r-- | desktop/sources/scripts/lib/acels.js | 6 | ||||
-rw-r--r-- | resources/MANUAL.txt (renamed from MANUAL.txt) | 0 | ||||
-rw-r--r-- | resources/TUTORIAL.md (renamed from TUTORIAL.md) | 0 | ||||
-rw-r--r-- | resources/WORKSHOP.md (renamed from WORKSHOP.md) | 0 | ||||
-rw-r--r-- | resources/glyph.grid | 174 | ||||
-rw-r--r-- | resources/glyph.png | bin | 153675 -> 0 bytes | |||
-rw-r--r-- | resources/glyph.svg | 1 | ||||
-rw-r--r-- | resources/listener.js (renamed from listener.js) | 0 | ||||
-rw-r--r-- | resources/logo.grid | 271 | ||||
-rw-r--r-- | resources/logo.png | bin | 94322 -> 0 bytes | |||
-rw-r--r-- | resources/logo.svg | 2 | ||||
-rw-r--r-- | sw.js | 2 |
16 files changed, 13 insertions, 468 deletions
@@ -104,13 +104,13 @@ The syntax is `pg:channel;msb;lsb;program`. Channel is 0-15, msb/lsb/program are The [UDP](https://nodejs.org/api/dgram.html#dgram_socket_send_msg_offset_length_port_address_callback) operator `;` locks each consecutive eastwardly ports. For example, `;hello`, will send the string "hello", on bang, to the port `49160` on `localhost`. In commander, use `udp:7777` to select the **custom UDP port 7777**, and `ip:127.0.0.12` to change the target IP. UDP is not available in the browser version of Orca. -You can use the [listener.js](https://github.com/hundredrabbits/Orca/blob/master/listener.js) to test UDP messages. See it in action with [udp.orca](https://github.com/hundredrabbits/Orca/blob/master/examples/_udp.orca). +You can use the [listener.js](https://github.com/hundredrabbits/Orca/blob/master/resources/listener.js) to test UDP messages. See it in action with [udp.orca](https://github.com/hundredrabbits/Orca/blob/master/examples/_udp.orca). ## OSC The [OSC](https://github.com/MylesBorins/node-osc) operator `=` locks each consecutive eastwardly ports. The first character is used for the path, the following characters are sent as integers using the [base36 Table](https://github.com/hundredrabbits/Orca#base36-table). In commander, use `osc:7777` to select the **custom OSC port 7777**, and `ip:127.0.0.12` to change the target IP. OSC is not available in the browser version of Orca. -For example, `=1abc` will send `10`, `11` and `12` to `/1`, via the port `49162` on `localhost`; `=a123` will send `1`, `2` and `3`, to the path `/a`. You can use the [listener.js](https://github.com/hundredrabbits/Orca/blob/master/listener.js) to test OSC messages. See it in action with [osc.orca](https://github.com/hundredrabbits/Orca/blob/master/examples/_osc.orca) or try it with [SonicPi](https://github.com/hundredrabbits/Orca/blob/master/TUTORIAL.md#sonicpi). +For example, `=1abc` will send `10`, `11` and `12` to `/1`, via the port `49162` on `localhost`; `=a123` will send `1`, `2` and `3`, to the path `/a`. You can use the [listener.js](https://github.com/hundredrabbits/Orca/blob/master/resources/listener.js) to test OSC messages. See it in action with [osc.orca](https://github.com/hundredrabbits/Orca/blob/master/examples/_osc.orca) or try it with [SonicPi](https://github.com/hundredrabbits/Orca/blob/master/resources/TUTORIAL.md#sonicpi). <img src='https://raw.githubusercontent.com/hundredrabbits/Orca/master/resources/preview.hardware.jpg' width="600"/> @@ -183,9 +183,6 @@ The midi operator interprets any letter above the chromatic scale as a transpose ## Tutorials - [Overview](https://www.youtube.com/watch?v=RaI_TuISSJE) - -### IO - - [Ableton & Unity3D](https://www.elizasj.com/unity_live_orca/) ### Basics diff --git a/desktop/icon.svg b/desktop/icon.svg index 481234d..eb3e660 100644 --- a/desktop/icon.svg +++ b/desktop/icon.svg @@ -1,12 +1,6 @@ -<svg class="vector" width="300px" height="300px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1" style="width: 300px; height: 300px; stroke: rgb(0, 0, 0); stroke-width: 0; fill: none; stroke-linecap: round;"> +<svg class="vector" width="300px" height="300px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1" style="width: 300px; height: 300px; stroke: rgb(0, 0, 0); stroke-width: 0; fill: none; stroke-linecap: round; background:black"> <rect width="300" height="300" style="fill:rgb(0,0,0)" /> - <circle cx="60" cy="60" r="7.5" fill="white"/> - <circle cx="150" cy="60" r="7.5" fill="white"/> - <circle cx="240" cy="60" r="7.5" fill="white"/> - <circle cx="60" cy="150" r="7.5" fill="white"/> - <circle cx="150" cy="150" r="7.5" fill="white"/> - <circle cx="240" cy="150" r="7.5" fill="white"/> - <circle cx="60" cy="240" r="7.5" fill="white"/> - <circle cx="150" cy="240" r="7.5" fill="white"/> - <circle cx="240" cy="240" r="7.5" fill="white"/> + <g transform="translate(8 48) scale(0.675)"> + <path d="M120,60 L120,60 L270,60 A30,30 0 0,1 300,90 L300,90 L300,240 M300,150 A30,30 0 0,1 270,180 L270,180 L150,180 A30,30 0 0,0 120,210 L120,210 L120,240 " style="stroke-width: 12; stroke-linecap: round; stroke-linejoin: round; stroke: rgb(255, 255, 255); fill: none;"/> + </g> </svg>
\ No newline at end of file diff --git a/desktop/package.json b/desktop/package.json index 1651fa6..42fa34f 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -11,7 +11,7 @@ "build_osx": "electron-packager . Orca --platform=darwin --arch=x64 --out ~/Documents/ --overwrite --icon=icon.icns ; echo 'Built for OSX'", "build_linux": "electron-packager . Orca --platform=linux --arch=x64 --out ~/Documents/ --overwrite --icon=icon.ico ; echo 'Built for LINUX'", "build_win": "electron-packager . Orca --platform=win32 --arch=x64 --out ~/Documents/ --overwrite --icon=icon.ico ; echo 'Built for WIN'", - "add_manual": "cp ../MANUAL.txt ~/Documents/Orca-darwin-x64/MANUAL.txt ; cp ../MANUAL.txt ~/Documents/Orca-linux-x64/MANUAL.txt ; cp ../MANUAL.txt ~/Documents/Orca-win32-x64/MANUAL.txt", + "add_manual": "cp ../resources/MANUAL.txt ~/Documents/Orca-darwin-x64/MANUAL.txt ; cp ../resources/MANUAL.txt ~/Documents/Orca-linux-x64/MANUAL.txt ; cp ../resources/MANUAL.txt ~/Documents/Orca-win32-x64/MANUAL.txt", "build": "npm run clean ; npm run build_osx ; npm run build_linux ; npm run build_win ; npm run add_manual", "push_osx": "~/Applications/butler push ~/Documents/Orca-darwin-x64/ hundredrabbits/orca:osx-64", "push_linux": "~/Applications/butler push ~/Documents/Orca-linux-x64/ hundredrabbits/orca:linux-64", diff --git a/desktop/sources/scripts/client.js b/desktop/sources/scripts/client.js index 525158a..d35a4d0 100644 --- a/desktop/sources/scripts/client.js +++ b/desktop/sources/scripts/client.js @@ -12,7 +12,7 @@ /* global Theme */ function Client () { - this.version = 170 + this.version = 171 this.library = library this.theme = new Theme(this) diff --git a/desktop/sources/scripts/lib/acels.js b/desktop/sources/scripts/lib/acels.js index cc00d61..62f630c 100644 --- a/desktop/sources/scripts/lib/acels.js +++ b/desktop/sources/scripts/lib/acels.js @@ -73,7 +73,7 @@ function Acels (client) { for (const cat in cats) { text += `\n### ${cat}\n\n` for (const item of cats[cat]) { - text += item.accelerator ? `- \`${item.accelerator.replace('`','tilde')}\`: ${item.name}\n` : '' + text += item.accelerator ? `- \`${item.accelerator.replace('`', 'tilde')}\`: ${item.name}\n` : '' } } return text.trim() @@ -106,13 +106,13 @@ function Acels (client) { submenu: [ { label: 'Download Themes', click: () => { require('electron').shell.openExternal('https://github.com/hundredrabbits/Themes') } }, { label: 'Open Theme', click: () => { client.theme.open() } }, - { label: 'Reset Theme', click: () => { client.theme.reset() } } + { label: 'Reset Theme', accelerator: 'CmdOrCtrl+Escape', click: () => { client.theme.reset() } } ] }, { label: 'Fullscreen', accelerator: 'CmdOrCtrl+Enter', click: () => { app.toggleFullscreen() } }, { label: 'Hide', accelerator: 'CmdOrCtrl+H', click: () => { app.toggleVisible() } }, { label: 'Toggle Menubar', accelerator: 'Alt+H', click: () => { app.toggleMenubar() } }, - { label: 'Inspect', accelerator: 'CmdOrCtrl+.', click: () => { app.inspect() } }, + { label: 'Inspect', accelerator: 'CmdOrCtrl+Tab', click: () => { app.inspect() } }, { role: 'quit' } ] }) diff --git a/MANUAL.txt b/resources/MANUAL.txt index fae4393..fae4393 100644 --- a/MANUAL.txt +++ b/resources/MANUAL.txt diff --git a/TUTORIAL.md b/resources/TUTORIAL.md index e4d60d5..e4d60d5 100644 --- a/TUTORIAL.md +++ b/resources/TUTORIAL.md diff --git a/WORKSHOP.md b/resources/WORKSHOP.md index 4dd8f8f..4dd8f8f 100644 --- a/WORKSHOP.md +++ b/resources/WORKSHOP.md diff --git a/resources/glyph.grid b/resources/glyph.grid deleted file mode 100644 index b8ec2a2..0000000 --- a/resources/glyph.grid +++ /dev/null @@ -1,174 +0,0 @@ -{ - "settings": { - "size": { - "width": 840, - "height": 300 - } - }, - "layers": [ - [], - [ - { - "type": "arc_c", - "vertices": [ - { - "x": 165, - "y": 90 - }, - { - "x": 240, - "y": 165 - }, - { - "x": 165, - "y": 240 - }, - { - "x": 90, - "y": 165 - }, - { - "x": 165, - "y": 90 - } - ] - }, - { - "type": "close", - "vertices": [] - }, - { - "type": "arc_c_full", - "vertices": [ - { - "x": 600, - "y": 165 - }, - { - "x": 525, - "y": 90 - } - ] - }, - { - "type": "arc_c_full", - "vertices": [ - { - "x": 630, - "y": 165 - }, - { - "x": 705, - "y": 240 - } - ] - }, - { - "type": "arc_c_full", - "vertices": [ - { - "x": 345, - "y": 240 - }, - { - "x": 420, - "y": 165 - } - ] - } - ], - [ - { - "type": "line", - "vertices": [ - { - "x": 255, - "y": 75 - }, - { - "x": 255, - "y": 255 - } - ] - }, - { - "type": "line", - "vertices": [ - { - "x": 435, - "y": 75 - }, - { - "x": 435, - "y": 255 - } - ] - }, - { - "type": "line", - "vertices": [ - { - "x": 615, - "y": 75 - }, - { - "x": 615, - "y": 255 - } - ] - }, - { - "type": "line", - "vertices": [ - { - "x": 795, - "y": 75 - }, - { - "x": 795, - "y": 255 - } - ] - }, - { - "type": "line", - "vertices": [ - { - "x": 75, - "y": 75 - }, - { - "x": 75, - "y": 255 - } - ] - } - ] - ], - "styles": [ - { - "thickness": 31, - "strokeLinecap": "round", - "strokeLinejoin": "round", - "color": "#000", - "fill": "none", - "mirror_style": 0 - }, - { - "thickness": 30, - "strokeLinecap": "butt", - "strokeLinejoin": "bevel", - "color": "#000", - "fill": "none", - "mirror_style": 0 - }, - { - "thickness": 1, - "strokeLinecap": "round", - "strokeLinejoin": "round", - "color": "#ddd", - "fill": "none", - "mirror_style": 0 - } - ] -}
\ No newline at end of file diff --git a/resources/glyph.png b/resources/glyph.png Binary files differdeleted file mode 100644 index 8ea6c88..0000000 --- a/resources/glyph.png +++ /dev/null diff --git a/resources/glyph.svg b/resources/glyph.svg deleted file mode 100644 index 89fc9fb..0000000 --- a/resources/glyph.svg +++ /dev/null @@ -1 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1" width="880px" height="310px" style="fill: none; width: 880px; height: 310px; stroke-width: 31;"><path d="M245,65 L245,65 L245,245 M425,65 L425,65 L425,245 M605,65 L605,65 L605,245 M785,65 L785,65 L785,245 M65,65 L65,65 L65,245 " style="stroke-width: 1; stroke-linecap: round; stroke-linejoin: round; stroke: rgb(221, 221, 221); fill: none;"/><path d="M155,80 A75,75 0 0,1 230,155 A75,75 0 0,1 155,230 A75,75 0 0,1 80,155 A75,75 0 0,1 155,80 Z M590,155 A75,75 0 1,1 515,80 M620,155 A75,75 0 1,1 695,230 M335,230 A75,75 0 1,1 410,155 " style="stroke-width: 30; stroke-linecap: butt; stroke-linejoin: bevel; stroke: rgb(0, 0, 0); fill: none;"/><path d="" style="stroke-width: 31; stroke-linecap: round; stroke-linejoin: round; stroke: rgb(0, 0, 0); fill: none;"/></svg>
\ No newline at end of file diff --git a/listener.js b/resources/listener.js index 582955a..582955a 100644 --- a/listener.js +++ b/resources/listener.js diff --git a/resources/logo.grid b/resources/logo.grid deleted file mode 100644 index 07fc340..0000000 --- a/resources/logo.grid +++ /dev/null @@ -1,271 +0,0 @@ -{ - "settings": { - "size": { - "width": 855, - "height": 300 - }, - "crest": false - }, - "layers": [ - [ - { - "type": "arc_r", - "vertices": [ - { - "x": 585, - "y": 120 - }, - { - "x": 570, - "y": 105 - }, - { - "x": 480, - "y": 105 - }, - { - "x": 465, - "y": 120 - }, - { - "x": 465, - "y": 180 - }, - { - "x": 480, - "y": 195 - }, - { - "x": 570, - "y": 195 - }, - { - "x": 585, - "y": 180 - } - ] - }, - { - "type": "arc_c", - "vertices": [ - { - "x": 645, - "y": 105 - }, - { - "x": 750, - "y": 105 - }, - { - "x": 765, - "y": 120 - }, - { - "x": 765, - "y": 195 - } - ] - }, - { - "type": "arc_c", - "vertices": [ - { - "x": 765, - "y": 135 - }, - { - "x": 750, - "y": 150 - } - ] - }, - { - "type": "arc_r", - "vertices": [ - { - "x": 750, - "y": 150 - }, - { - "x": 660, - "y": 150 - }, - { - "x": 645, - "y": 165 - }, - { - "x": 645, - "y": 165 - }, - { - "x": 645, - "y": 195 - }, - { - "x": 645, - "y": 195 - } - ] - }, - { - "type": "arc_c", - "vertices": [ - { - "x": 225, - "y": 180 - }, - { - "x": 210, - "y": 195 - }, - { - "x": 120, - "y": 195 - }, - { - "x": 105, - "y": 180 - }, - { - "x": 105, - "y": 120 - }, - { - "x": 120, - "y": 105 - }, - { - "x": 210, - "y": 105 - }, - { - "x": 225, - "y": 120 - } - ] - }, - { - "type": "close", - "vertices": [] - }, - { - "type": "arc_c", - "vertices": [ - { - "x": 285, - "y": 195 - }, - { - "x": 285, - "y": 105 - }, - { - "x": 390, - "y": 105 - }, - { - "x": 405, - "y": 120 - }, - { - "x": 405, - "y": 135 - }, - { - "x": 390, - "y": 150 - }, - { - "x": 285, - "y": 150 - }, - { - "x": 285, - "y": 150 - }, - { - "x": 390, - "y": 150 - }, - { - "x": 405, - "y": 165 - }, - { - "x": 405, - "y": 195 - } - ] - } - ], - [], - [ - { - "type": "line", - "vertices": [ - { - "x": 255, - "y": 75 - }, - { - "x": 255, - "y": 225 - } - ] - }, - { - "type": "line", - "vertices": [ - { - "x": 435, - "y": 75 - }, - { - "x": 435, - "y": 225 - } - ] - }, - { - "type": "line", - "vertices": [ - { - "x": 615, - "y": 75 - }, - { - "x": 615, - "y": 225 - } - ] - } - ] - ], - "styles": [ - { - "thickness": 5, - "strokeLinecap": "square", - "strokeLinejoin": "miter", - "color": "#000", - "fill": "none", - "mirror_style": 0 - }, - { - "thickness": 25, - "strokeLinecap": "round", - "strokeLinejoin": "round", - "color": "#f00", - "fill": "none", - "mirror_style": 0 - }, - { - "thickness": 2, - "strokeLinecap": "round", - "strokeLinejoin": "round", - "color": "#ddd", - "fill": "none", - "mirror_style": 0 - } - ] -}
\ No newline at end of file diff --git a/resources/logo.png b/resources/logo.png Binary files differdeleted file mode 100644 index bb2c6a8..0000000 --- a/resources/logo.png +++ /dev/null diff --git a/resources/logo.svg b/resources/logo.svg index 26350e3..fe3e997 100644 --- a/resources/logo.svg +++ b/resources/logo.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1" width="850px" height="310px" style="fill: none; width: 850px; height: 310px; stroke-width: 2;"><path d="M245,65 L245,65 L245,215 M425,65 L425,65 L425,215 M605,65 L605,65 L605,215 " style="stroke-width: 2; stroke-linecap: round; stroke-linejoin: round; stroke: rgb(221, 221, 221); fill: none;"/><path d="" style="stroke-width: 5; stroke-linecap: round; stroke-linejoin: round; stroke: rgb(255, 0, 0); fill: none;"/><path d="M575,110 A15,15 0 0,0 560,95 A90,0 0 0,0 470,95 A15,15 0 0,0 455,110 A0,60 0 0,0 455,170 A15,15 0 0,0 470,185 A90,0 0 0,0 560,185 A15,15 0 0,0 575,170 M275,95 A105,0 0 0,1 380,95 A15,15 0 0,1 395,110 A0,15 0 0,1 395,125 A15,15 0 0,1 380,140 A105,0 0 0,1 275,140 M380,140 A15,15 0 0,1 395,155 A0,30 0 0,1 395,185 M635,95 A105,0 0 0,1 740,95 A15,15 0 0,1 755,110 A0,75 0 0,1 755,185 M755,125 A15,15 0 0,1 740,140 A90,0 0 0,0 650,140 A15,15 0 0,0 635,155 A0,0 0 0,0 635,155 A0,15 0 0,0 635,170 A15,15 0 0,0 650,185 A90,0 0 0,0 740,185 A15,15 0 0,0 755,170 M275,95 L275,95 L275,185 M215,170 A15,15 0 0,1 200,185 A90,0 0 0,1 110,185 A15,15 0 0,1 95,170 A0,60 0 0,1 95,110 A15,15 0 0,1 110,95 A90,0 0 0,1 200,95 A15,15 0 0,1 215,110 Z " style="stroke-width: 12; stroke-linecap: square; stroke-linejoin: round; stroke: rgb(0, 0, 0); fill: none;"/></svg>
\ No newline at end of file +<svg xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1" style="fill: none;" width="900px" height="300px"><path style="stroke-width: 2px; stroke-linecap: round; stroke-linejoin: round; stroke: rgb(221, 221, 221); fill: none;" d=""/><path style="stroke-width: 25px; stroke-linecap: round; stroke-linejoin: round; stroke: rgb(255, 0, 0); fill: none;" d=""/><path style="stroke-width: 5px; stroke-linecap: square; stroke-linejoin: miter; stroke: rgb(0, 0, 0); fill: none;" d="M585,120 A15,15 0 0,0 570,105 L480,105 A15,15 0 0,0 465,120 L465,180 A15,15 0 0,0 480,195 L570,195 A15,15 0 0,0 585,180 M645,105 L750,105 A15,15 0 0,1 765,120 L765,195 M765,135 A15,15 0 0,1 750,150 L660,150 A15,15 0 0,0 645,165 L645,165 L645,195 L645,195 M225,180 A15,15 0 0,1 210,195 L120,195 A15,15 0 0,1 105,180 L105,120 A15,15 0 0,1 120,105 L210,105 A15,15 0 0,1 225,120 Z M285,195 L285,105 L390,105 A15,15 0 0,1 405,120 L405,135 A15,15 0 0,1 390,150 L285,150 L285,150 L390,150 A15,15 0 0,1 405,165 L405,195 "/></svg>
\ No newline at end of file @@ -1,4 +1,4 @@ -// 170 +// 171 const assets = [ './', |