aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorneauoire <[email protected]>2020-02-06 15:29:24 -0500
committerneauoire <[email protected]>2020-02-06 15:29:24 -0500
commitbe105583a74fe2a016c5571a772202c33ea48128 (patch)
tree024821263aa5a9e5e1c57037bb11e069a59749dd
parentbce64c0cfa827c054300181085de74d9594ece97 (diff)
downloadOrca-be105583a74fe2a016c5571a772202c33ea48128.tar.gz
Orca-be105583a74fe2a016c5571a772202c33ea48128.zip
*
-rw-r--r--README.md6
-rw-r--r--desktop/sources/scripts/lib/source.js2
-rw-r--r--examples/basics/_midi.orca (renamed from examples/_midi.orca)0
-rw-r--r--examples/basics/_osc.orca (renamed from examples/_osc.orca)0
-rw-r--r--examples/basics/_udp.orca (renamed from examples/_udp.orca)0
-rw-r--r--examples/basics/a.orca (renamed from examples/a.orca)0
-rw-r--r--examples/basics/b.orca (renamed from examples/b.orca)0
-rw-r--r--examples/basics/c.orca (renamed from examples/c.orca)0
-rw-r--r--examples/basics/d.orca (renamed from examples/d.orca)0
-rw-r--r--examples/basics/f.orca (renamed from examples/f.orca)0
-rw-r--r--examples/basics/g.orca (renamed from examples/g.orca)0
-rw-r--r--examples/basics/h.orca (renamed from examples/h.orca)0
-rw-r--r--examples/basics/i.orca (renamed from examples/i.orca)0
-rw-r--r--examples/basics/j.orca (renamed from examples/j.orca)0
-rw-r--r--examples/basics/k.orca (renamed from examples/k.orca)0
-rw-r--r--examples/basics/l.orca (renamed from examples/l.orca)0
-rw-r--r--examples/basics/u.orca (renamed from examples/u.orca)0
-rw-r--r--examples/basics/v.orca (renamed from examples/v.orca)0
-rw-r--r--examples/basics/z.orca (renamed from examples/z.orca)0
-rw-r--r--examples/tutorial/README.md7
-rw-r--r--examples/tutorial/begin.orca3
-rw-r--r--examples/tutorial/slide0.orca13
-rw-r--r--examples/tutorial/slide1.orca13
-rw-r--r--examples/tutorial/slide2.orca13
-rw-r--r--examples/tutorial/slide3.orca13
-rw-r--r--examples/tutorial/slide4.orca1
-rw-r--r--examples/tutorial/slide5.orca1
-rw-r--r--examples/tutorial/slide6.orca1
-rw-r--r--examples/tutorial/slide7.orca1
29 files changed, 70 insertions, 4 deletions
diff --git a/README.md b/README.md
index 9783e16..d84fab8 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ To display the list of operators inside of Orca, use `CmdOrCtrl+G`.
The [MIDI](https://en.wikipedia.org/wiki/MIDI) operator `:` takes up to 5 inputs('channel, 'octave, 'note, velocity, length).
-For example, `:25C`, is a **C note, on the 5th octave, through the 3rd MIDI channel**, `:04c`, is a **C# note, on the 4th octave, through the 1st MIDI channel**. Velocity is an optional value from `0`(0/127) to `g`(127/127). Note length is the number of frames during which a note remains active. See it in action with [midi.orca](https://github.com/hundredrabbits/Orca/blob/master/examples/_midi.orca).
+For example, `:25C`, is a **C note, on the 5th octave, through the 3rd MIDI channel**, `:04c`, is a **C# note, on the 4th octave, through the 1st MIDI channel**. Velocity is an optional value from `0`(0/127) to `g`(127/127). Note length is the number of frames during which a note remains active. See it in action with [midi.orca](https://github.com/hundredrabbits/Orca/blob/master/examples/basics/_midi.orca).
## MIDI MONO
@@ -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/resources/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/basics/_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/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).
+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/basics/_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"/>
diff --git a/desktop/sources/scripts/lib/source.js b/desktop/sources/scripts/lib/source.js
index abbdf89..ba2554c 100644
--- a/desktop/sources/scripts/lib/source.js
+++ b/desktop/sources/scripts/lib/source.js
@@ -37,7 +37,7 @@ function Source (client) {
input.setAttribute('multiple', 'multiple')
input.onchange = (e) => {
for (const file of e.target.files) {
- if (file.name.indexOf('.' + ext) < 0) { console.warn('Source', `Skipped ${file.name}`); return }
+ if (file.name.indexOf('.' + ext) < 0) { console.warn('Source', `Skipped ${file.name}`); continue }
this.read(file, this.store)
}
}
diff --git a/examples/_midi.orca b/examples/basics/_midi.orca
index 5f7db5e..5f7db5e 100644
--- a/examples/_midi.orca
+++ b/examples/basics/_midi.orca
diff --git a/examples/_osc.orca b/examples/basics/_osc.orca
index de6e99d..de6e99d 100644
--- a/examples/_osc.orca
+++ b/examples/basics/_osc.orca
diff --git a/examples/_udp.orca b/examples/basics/_udp.orca
index f25cdf6..f25cdf6 100644
--- a/examples/_udp.orca
+++ b/examples/basics/_udp.orca
diff --git a/examples/a.orca b/examples/basics/a.orca
index 504af32..504af32 100644
--- a/examples/a.orca
+++ b/examples/basics/a.orca
diff --git a/examples/b.orca b/examples/basics/b.orca
index 556c8f3..556c8f3 100644
--- a/examples/b.orca
+++ b/examples/basics/b.orca
diff --git a/examples/c.orca b/examples/basics/c.orca
index c3ae8fe..c3ae8fe 100644
--- a/examples/c.orca
+++ b/examples/basics/c.orca
diff --git a/examples/d.orca b/examples/basics/d.orca
index e0d158e..e0d158e 100644
--- a/examples/d.orca
+++ b/examples/basics/d.orca
diff --git a/examples/f.orca b/examples/basics/f.orca
index 1858d89..1858d89 100644
--- a/examples/f.orca
+++ b/examples/basics/f.orca
diff --git a/examples/g.orca b/examples/basics/g.orca
index 43d166e..43d166e 100644
--- a/examples/g.orca
+++ b/examples/basics/g.orca
diff --git a/examples/h.orca b/examples/basics/h.orca
index 404dbac..404dbac 100644
--- a/examples/h.orca
+++ b/examples/basics/h.orca
diff --git a/examples/i.orca b/examples/basics/i.orca
index 60cd9c0..60cd9c0 100644
--- a/examples/i.orca
+++ b/examples/basics/i.orca
diff --git a/examples/j.orca b/examples/basics/j.orca
index f4a416a..f4a416a 100644
--- a/examples/j.orca
+++ b/examples/basics/j.orca
diff --git a/examples/k.orca b/examples/basics/k.orca
index ff4d0d0..ff4d0d0 100644
--- a/examples/k.orca
+++ b/examples/basics/k.orca
diff --git a/examples/l.orca b/examples/basics/l.orca
index d2a305e..d2a305e 100644
--- a/examples/l.orca
+++ b/examples/basics/l.orca
diff --git a/examples/u.orca b/examples/basics/u.orca
index 8bc8ef9..8bc8ef9 100644
--- a/examples/u.orca
+++ b/examples/basics/u.orca
diff --git a/examples/v.orca b/examples/basics/v.orca
index a8e70e2..a8e70e2 100644
--- a/examples/v.orca
+++ b/examples/basics/v.orca
diff --git a/examples/z.orca b/examples/basics/z.orca
index 0d2138d..0d2138d 100644
--- a/examples/z.orca
+++ b/examples/basics/z.orca
diff --git a/examples/tutorial/README.md b/examples/tutorial/README.md
new file mode 100644
index 0000000..3ff1ce9
--- /dev/null
+++ b/examples/tutorial/README.md
@@ -0,0 +1,7 @@
+# Tutorial
+
+This is an interactive tutorial created in Orca itself, to get started, open Orca and press `CmdOrCtrl+L` to load the files found in this directory, then press `CmdOrCtrl+B` and write `inject:begin`, and press `enter`.
+
+You should see 3 lines at the top of your files, to load a slide, locate the `$in:slide0` text, move your cursor onto the `$`(commander) operator and press `enter`. To navigate to another slide, change the value to `$in:slide1`, and activate the commander operator once more.
+
+Good luck! \ No newline at end of file
diff --git a/examples/tutorial/begin.orca b/examples/tutorial/begin.orca
new file mode 100644
index 0000000..8b44ab6
--- /dev/null
+++ b/examples/tutorial/begin.orca
@@ -0,0 +1,3 @@
+.#ORCA.TUTORIAL.#..................D.....
+....................................$ti..
+.$in:slide0.........................0505.
diff --git a/examples/tutorial/slide0.orca b/examples/tutorial/slide0.orca
new file mode 100644
index 0000000..9aef039
--- /dev/null
+++ b/examples/tutorial/slide0.orca
@@ -0,0 +1,13 @@
+...............................................
+#.WELCOME......#...............................
+...............................................
+#.Each.letter.of.the.alphabet.is.an.operation.#
+#.Uppercased.letters.operator.each.frame......#
+#.Lowercased.letters.operate.on.bang..........#
+...............................................
+.......#.UC....#.......#.LC....#...............
+........................D......................
+.........I8.............*i8....................
+.........l...............d.....................
+...............................................
+...............................................
diff --git a/examples/tutorial/slide1.orca b/examples/tutorial/slide1.orca
new file mode 100644
index 0000000..d941172
--- /dev/null
+++ b/examples/tutorial/slide1.orca
@@ -0,0 +1,13 @@
+...............................................
+#.PORTS........#...............................
+...............................................
+#.Operators.have.ports........................#
+#.Ports.can.be.inputs.or.outputs..............#
+#.Ports.can.lock.or.unlock.other.ports........#
+...............................................
+...#.Cyan.Port.#..C..#.White.Port.#............
+..................7............................
+...............................................
+..................#.Output.#...................
+...............................................
+...............................................
diff --git a/examples/tutorial/slide2.orca b/examples/tutorial/slide2.orca
new file mode 100644
index 0000000..b54f8ca
--- /dev/null
+++ b/examples/tutorial/slide2.orca
@@ -0,0 +1,13 @@
+...............................................
+#.OPERATORS....#...............................
+...............................................
+#.Each.letter.is.a.unique.function............#
+#.The.A.operator.adds.its.two.inputs..........#
+#.The.C.operator.counts.up.to.the.input.......#
+...............................................
+.......#.Add...#.......#.Clock.#...............
+...............................................
+.......2A3A4...........2C3C4...................
+........5A7.............2C1....................
+.........c...............0.....................
+...............................................
diff --git a/examples/tutorial/slide3.orca b/examples/tutorial/slide3.orca
new file mode 100644
index 0000000..50f378e
--- /dev/null
+++ b/examples/tutorial/slide3.orca
@@ -0,0 +1,13 @@
+...............................................
+#.SPECIALS.....#...............................
+...............................................
+#.Special.characters.are.IO.operators.........#
+#.The.Midi.operator.is.the.colon.character....#
+#.It.sends.midi.values.to.a.midi.device.......#
+...............................................
+.......#.3C.Note.to.channel.1..#...............
+...............................................
+.......D.......................................
+.......*:03C...................................
+...............................................
+...............................................
diff --git a/examples/tutorial/slide4.orca b/examples/tutorial/slide4.orca
new file mode 100644
index 0000000..30404ce
--- /dev/null
+++ b/examples/tutorial/slide4.orca
@@ -0,0 +1 @@
+TODO \ No newline at end of file
diff --git a/examples/tutorial/slide5.orca b/examples/tutorial/slide5.orca
new file mode 100644
index 0000000..30404ce
--- /dev/null
+++ b/examples/tutorial/slide5.orca
@@ -0,0 +1 @@
+TODO \ No newline at end of file
diff --git a/examples/tutorial/slide6.orca b/examples/tutorial/slide6.orca
new file mode 100644
index 0000000..30404ce
--- /dev/null
+++ b/examples/tutorial/slide6.orca
@@ -0,0 +1 @@
+TODO \ No newline at end of file
diff --git a/examples/tutorial/slide7.orca b/examples/tutorial/slide7.orca
new file mode 100644
index 0000000..30404ce
--- /dev/null
+++ b/examples/tutorial/slide7.orca
@@ -0,0 +1 @@
+TODO \ No newline at end of file