diff --git a/README.md b/README.md index a97faa3..172d51d 100644 --- a/README.md +++ b/README.md @@ -1,139 +1,6 @@ # Ronin -## Basics -Ronin is a web based drawing application and visual language. Launch Ronin and press **:**(colon) to display the command prompt. -``` -: -``` -### Controls -``` -ctrl ; Draw Overlays -alt ; Drag Surface -shift ; Erase -shift+ctrl ; Eyedrop -shift+alt ; Move Layer -``` -## Modules -### # Surface -Missing documentation. -- Parameters: `Rect` `Color` `Bang` -- Variables: `layer` -### / FileLoad -Missing documentation. -- Parameters: `Filepath` `Position` `Rect` -- Variables: - -### $ FileSave -Creates a new window with a image of the resulting canvas in the specified format. -- Parameters: `Any` -- Variables: `format` - -### ^ History -Missing documentation. -- Parameters: -- Variables: - -### | Overlay -Missing documentation. -- Parameters: `Position` `Rect` `Color` -- Variables: - -### % Render -Missing documentation. -- Parameters: `Any` -- Variables: - -### > Brush -Missing documentation. -- Parameters: `Position` `Rect` `Angle` `Color` `Value` `Bang` -- Variables: `natural` `banking` - -### . Eraser -Missing documentation. -- Parameters: `Value` -- Variables: - -### * Eye -Missing documentation. -- Parameters: -- Variables: - -### & Typographe -Missing documentation. -- Parameters: `Position` `Color` `Value` -- Variables: `text` `font` - -### _ Stroke -Missing documentation. -- Parameters: `Any` -- Variables: - -### + Vector -Missing documentation. -- Parameters: `Any` -- Variables: `fill_color` `stroke_width` `stroke_color` `line_cap` - -### ? Help -Missing documentation. -- Parameters: -- Variables: - -## Filters -### stencil -### rotate -### invert -### chromatic - - -## Units -``` -5 ; value: 5 -5,7 ; position: 5x 7y -7x9 ; rect: 7w 9h -#ff0000 ; color: red -0..5 ; random: 0.0-5.0 -45' ; degree: 45/365 -rate=10 ; variable: rate = 10 -``` -## Presets -### Radial Brush -``` -# 8 strands -> 600,400 45';> 600,400 90';> 600,400 135';> 600,400 180';> 600,400 225';> 600,400 270';> 600,400 315' -# 6 strands -> 600,400 60';> 600,400 120';> 600,400 180';> 600,400 240';> 600,400 300' -``` -### Symmetry Brush -``` -# XY -> 400x 3 -# Angular brushes -> 400x 1,1;> 400x 2,2;> 400x 3,3; > 1,1;> 2,2;> 3,3; -``` -### Angular Brush -``` -# Light -> 1,1;> 2,2;> 3,3;> 4,4 -# Hard -> 2,2;> 4,4;> 6,6;> 8,8 -# Symmetric Light -> 1,1 600x;> 2,2 600x;> 3,3 600x;> 4,4 600x -``` -## Templates -### Watermark -``` -# 1280x720 ; / ../assets/photo.jpg 1280x 0,0 ; / ../assets/logo.png 60x60 20,640 -``` -## vectors -### Ronin Logo -``` -+ M150,53 A-96,97 0 0,0 246,150 M150,246 A97,-96 0 0,0 53,150 M53,101 A-48,-48 0 0,0 101,53 M246,101 A48,-48 0 0,1 198,53 M53,198 A-48,48 0 0,1 101,246 M246,198 A48,48 0 0,0 198,246 stroke_width=45 line_cap=square stroke_color=black -``` -### A Circle -``` -+ M 100, 100 m -75, 0 a 75,75 0 1,0 150,0 a 75,75 0 1,0 -150,0 -``` -### Many Circles -``` -+ M 64, 64 m -50, 0 a 50,50 0 1,0 100,0 a 50,50 0 1,0 -100,0;+ M 64, 64 m -45, 0 a 45,45 0 1,0 90,0 a 45,45 0 1,0 -90,0;+ M 64, 64 m -40, 0 a 40,40 0 1,0 80,0 a 40,40 0 1,0 -80,0;+ M 64, 64 m -35, 0 a 35,35 0 1,0 70,0 a 35,35 0 1,0 -70,0;+ M 64, 64 m -30, 0 a 30,30 0 1,0 60,0 a 30,30 0 1,0 -60,0;+ M 64, 64 m -25, 0 a 25,25 0 1,0 50,0 a 25,25 0 1,0 -50,0;+ M 64, 64 m -20, 0 a 20,20 0 1,0 40,0 a 20,20 0 1,0 -40,0;+ M 64, 64 m -15, 0 a 15,15 0 1,0 30,0 a 15,15 0 1,0 -30,0;+ M 64, 64 m -10, 0 a 10,10 0 1,0 20,0 a 10,10 0 1,0 -20,0;+ M 64, 64 m -5, 0 a 5,5 0 1,0 10,0 a 5,5 0 1,0 -10,0 -``` \ No newline at end of file +Ronin is a web based drawing application and visual language. +The repository comes with a script that fires Ronin from within Localhost. +Launch Ronin and press **:**(colon) to display the command prompt. +Enjoy \ No newline at end of file diff --git a/Ronin.command b/Ronin Server.command similarity index 65% rename from Ronin.command rename to Ronin Server.command index 7ee92f8..34cb05f 100755 --- a/Ronin.command +++ b/Ronin Server.command @@ -2,6 +2,6 @@ cd `dirname "$BASH_SOURCE"` { sleep 1 - open http://localhost:8022/sources/ronin.html + open http://localhost:8022/ }& python -m SimpleHTTPServer 8022 diff --git a/sources/ronin.html b/index.html similarity index 100% rename from sources/ronin.html rename to index.html diff --git a/sources/links/fonts.css b/links/fonts.css similarity index 100% rename from sources/links/fonts.css rename to links/fonts.css diff --git a/sources/links/main.css b/links/main.css similarity index 99% rename from sources/links/main.css rename to links/main.css index b77e5ce..cbcf534 100644 --- a/sources/links/main.css +++ b/links/main.css @@ -9,7 +9,7 @@ canvas:hover { cursor: crosshair;} #overlay { position:absolute; z-index:1000;} #widget { color:#fff; position:absolute; font-size:10px; padding-top:10px; border-top:1px solid #333; background-image:url(../media/graphics/logo.svg); background-repeat:no-repeat; background-size:80px 80px; height:100px; background-position: -10px 10px; line-height:20px;} #widget .module:first-child { margin-left:80px; } -#widget .module { float:left; margin-right:10px; margin-top:5px; width: 20% } +#widget .module { float:left; margin-right:10px; margin-top:5px; width: 25% } #widget .module .layer { color:#999; padding:2px 5px;} #widget .module .highlight { background:#fff; color:black;} #widget .module .highlight.managed { background:red; color:black; } diff --git a/sources/links/reset.css b/links/reset.css similarity index 100% rename from sources/links/reset.css rename to links/reset.css diff --git "a/assets/Icon\r" "b/media/fonts/Icon\r" similarity index 100% rename from "assets/Icon\r" rename to "media/fonts/Icon\r" diff --git a/sources/media/fonts/input_mono_medium.ttf b/media/fonts/input_mono_medium.ttf similarity index 100% rename from sources/media/fonts/input_mono_medium.ttf rename to media/fonts/input_mono_medium.ttf diff --git a/sources/media/fonts/input_mono_regular.ttf b/media/fonts/input_mono_regular.ttf similarity index 100% rename from sources/media/fonts/input_mono_regular.ttf rename to media/fonts/input_mono_regular.ttf diff --git "a/sources/links/Icon\r" "b/media/graphics/Icon\r" similarity index 100% rename from "sources/links/Icon\r" rename to "media/graphics/Icon\r" diff --git a/sources/media/graphics/grid.svg b/media/graphics/grid.svg similarity index 100% rename from sources/media/graphics/grid.svg rename to media/graphics/grid.svg diff --git a/sources/media/graphics/logo.svg b/media/graphics/logo.svg similarity index 100% rename from sources/media/graphics/logo.svg rename to media/graphics/logo.svg diff --git "a/sources/media/Icon\r" "b/media/icons/Icon\r" similarity index 100% rename from "sources/media/Icon\r" rename to "media/icons/Icon\r" diff --git a/sources/media/icons/black.ico b/media/icons/black.ico similarity index 100% rename from sources/media/icons/black.ico rename to media/icons/black.ico diff --git a/sources/media/icons/grey.ico b/media/icons/grey.ico similarity index 100% rename from sources/media/icons/grey.ico rename to media/icons/grey.ico diff --git a/sources/media/icons/red.ico b/media/icons/red.ico similarity index 100% rename from sources/media/icons/red.ico rename to media/icons/red.ico diff --git a/sources/scripts/core/command.js b/scripts/core/command.js similarity index 100% rename from sources/scripts/core/command.js rename to scripts/core/command.js diff --git a/sources/scripts/core/commander.hint.js b/scripts/core/commander.hint.js similarity index 100% rename from sources/scripts/core/commander.hint.js rename to scripts/core/commander.hint.js diff --git a/sources/scripts/core/commander.js b/scripts/core/commander.js similarity index 100% rename from sources/scripts/core/commander.js rename to scripts/core/commander.js diff --git a/sources/scripts/core/cursor.js b/scripts/core/cursor.js similarity index 100% rename from sources/scripts/core/cursor.js rename to scripts/core/cursor.js diff --git a/sources/scripts/core/init.js b/scripts/core/init.js similarity index 100% rename from sources/scripts/core/init.js rename to scripts/core/init.js diff --git a/sources/scripts/core/keyboard.js b/scripts/core/keyboard.js similarity index 100% rename from sources/scripts/core/keyboard.js rename to scripts/core/keyboard.js diff --git a/sources/scripts/core/ronin.js b/scripts/core/ronin.js similarity index 100% rename from sources/scripts/core/ronin.js rename to scripts/core/ronin.js diff --git a/sources/scripts/core/widget.js b/scripts/core/widget.js similarity index 100% rename from sources/scripts/core/widget.js rename to scripts/core/widget.js diff --git a/sources/scripts/filters/balance.js b/scripts/filters/balance.js similarity index 100% rename from sources/scripts/filters/balance.js rename to scripts/filters/balance.js diff --git a/sources/scripts/filters/chromatic.js b/scripts/filters/chromatic.js similarity index 100% rename from sources/scripts/filters/chromatic.js rename to scripts/filters/chromatic.js diff --git a/sources/scripts/filters/filter.js b/scripts/filters/filter.js similarity index 100% rename from sources/scripts/filters/filter.js rename to scripts/filters/filter.js diff --git a/sources/scripts/filters/invert.js b/scripts/filters/invert.js similarity index 100% rename from sources/scripts/filters/invert.js rename to scripts/filters/invert.js diff --git a/sources/scripts/filters/rotate.js b/scripts/filters/rotate.js similarity index 100% rename from sources/scripts/filters/rotate.js rename to scripts/filters/rotate.js diff --git a/sources/scripts/filters/saturation.js b/scripts/filters/saturation.js similarity index 100% rename from sources/scripts/filters/saturation.js rename to scripts/filters/saturation.js diff --git a/sources/scripts/filters/stencil.js b/scripts/filters/stencil.js similarity index 100% rename from sources/scripts/filters/stencil.js rename to scripts/filters/stencil.js diff --git a/sources/scripts/modules/brush.js b/scripts/modules/brush.js similarity index 100% rename from sources/scripts/modules/brush.js rename to scripts/modules/brush.js diff --git a/sources/scripts/modules/brush.pointer.js b/scripts/modules/brush.pointer.js similarity index 100% rename from sources/scripts/modules/brush.pointer.js rename to scripts/modules/brush.pointer.js diff --git a/sources/scripts/modules/eraser.js b/scripts/modules/eraser.js similarity index 100% rename from sources/scripts/modules/eraser.js rename to scripts/modules/eraser.js diff --git a/sources/scripts/modules/eye.js b/scripts/modules/eye.js similarity index 100% rename from sources/scripts/modules/eye.js rename to scripts/modules/eye.js diff --git a/sources/scripts/modules/file.load.js b/scripts/modules/file.load.js similarity index 100% rename from sources/scripts/modules/file.load.js rename to scripts/modules/file.load.js diff --git a/sources/scripts/modules/file.save.js b/scripts/modules/file.save.js similarity index 90% rename from sources/scripts/modules/file.save.js rename to scripts/modules/file.save.js index 800b8d0..41bb94e 100644 --- a/sources/scripts/modules/file.save.js +++ b/scripts/modules/file.save.js @@ -2,7 +2,7 @@ function FileSave(rune) { Module.call(this,rune); - this.parameters = [Any]; + this.parameters = []; this.variables = {"format" : "[png/jpg]"}; this.docs = "Creates a new window with a image of the resulting canvas in the specified format."; @@ -35,7 +35,9 @@ function FileSave(rune) { var a = []; Object.keys(ronin.surface.layers).forEach(function (key) { - a.push(ronin.surface.layers[key]); + if(!ronin.surface.layers[key].manager){ + a.push(ronin.surface.layers[key]); + } }); for (i = 0; i < a.length; i++) { this.layer.context().drawImage(a[i].context().canvas,0,0,ronin.surface.size.width,ronin.surface.size.height); diff --git a/sources/scripts/modules/help.js b/scripts/modules/help.js similarity index 93% rename from sources/scripts/modules/help.js rename to scripts/modules/help.js index cc68c4c..204a440 100644 --- a/sources/scripts/modules/help.js +++ b/scripts/modules/help.js @@ -12,7 +12,7 @@ function Help(rune) html += this.view_filters(); html += this.view_units(); html += this.view_presets(); - w.document.write("<title>Help</title><style>body { font-size:11px;background:#111; color:#fff; padding:20px} pre { font-family:Monaco,Courier} pre div{ border-left:5px solid #222; padding-left:20px;} pre div b { text-decoration:underline; color:#999; font-weight:normal} pre div i { font-style:normal; color:#72dec2}</style><pre>"+html+"</pre>"); + w.document.write("<title>Help</title><style>body { font-size:11px;background:#111; color:#fff; padding:20px; overflow-x:hidden} pre { font-family:Monaco,Courier} pre div{ border-left:5px solid #222; padding-left:20px;} pre div b { text-decoration:underline; color:#999; font-weight:normal} pre div i { font-style:normal; color:#72dec2}</style><pre>"+html+"</pre>"); } // diff --git a/sources/scripts/modules/history.js b/scripts/modules/history.js similarity index 100% rename from sources/scripts/modules/history.js rename to scripts/modules/history.js diff --git a/sources/scripts/modules/module.js b/scripts/modules/module.js similarity index 100% rename from sources/scripts/modules/module.js rename to scripts/modules/module.js diff --git a/sources/scripts/modules/overlay.js b/scripts/modules/overlay.js similarity index 100% rename from sources/scripts/modules/overlay.js rename to scripts/modules/overlay.js diff --git a/sources/scripts/modules/render.js b/scripts/modules/render.js similarity index 92% rename from sources/scripts/modules/render.js rename to scripts/modules/render.js index b1f6f99..57b26b1 100644 --- a/sources/scripts/modules/render.js +++ b/scripts/modules/render.js @@ -40,8 +40,8 @@ function Render(rune) this.hint = function(cmd) { - var input = cmd.content.join(" ").trim(); - var s = this.pad(input); + var input = cmd.content.join(" ").trim().split(" ")[0]; + var s = this.pad(cmd.content.join(" ")); if(this.collection[input]){ for (i = 0; i < this.collection[input].parameters.length; i++) { diff --git a/sources/scripts/modules/stroke.js b/scripts/modules/stroke.js similarity index 100% rename from sources/scripts/modules/stroke.js rename to scripts/modules/stroke.js diff --git a/sources/scripts/modules/surface.js b/scripts/modules/surface.js similarity index 100% rename from sources/scripts/modules/surface.js rename to scripts/modules/surface.js diff --git a/sources/scripts/modules/surface.layer.js b/scripts/modules/surface.layer.js similarity index 100% rename from sources/scripts/modules/surface.layer.js rename to scripts/modules/surface.layer.js diff --git a/sources/scripts/modules/typographe.js b/scripts/modules/typographe.js similarity index 100% rename from sources/scripts/modules/typographe.js rename to scripts/modules/typographe.js diff --git a/sources/scripts/modules/vector.js b/scripts/modules/vector.js similarity index 100% rename from sources/scripts/modules/vector.js rename to scripts/modules/vector.js diff --git a/sources/scripts/units/angle.js b/scripts/units/angle.js similarity index 100% rename from sources/scripts/units/angle.js rename to scripts/units/angle.js diff --git a/sources/scripts/units/any.js b/scripts/units/any.js similarity index 100% rename from sources/scripts/units/any.js rename to scripts/units/any.js diff --git a/sources/scripts/units/bang.js b/scripts/units/bang.js similarity index 100% rename from sources/scripts/units/bang.js rename to scripts/units/bang.js diff --git a/sources/scripts/units/color.js b/scripts/units/color.js similarity index 100% rename from sources/scripts/units/color.js rename to scripts/units/color.js diff --git a/sources/scripts/units/filepath.js b/scripts/units/filepath.js similarity index 100% rename from sources/scripts/units/filepath.js rename to scripts/units/filepath.js diff --git a/sources/scripts/units/position.js b/scripts/units/position.js similarity index 100% rename from sources/scripts/units/position.js rename to scripts/units/position.js diff --git a/sources/scripts/units/range.js b/scripts/units/range.js similarity index 100% rename from sources/scripts/units/range.js rename to scripts/units/range.js diff --git a/sources/scripts/units/rect.js b/scripts/units/rect.js similarity index 100% rename from sources/scripts/units/rect.js rename to scripts/units/rect.js diff --git a/sources/scripts/units/unit.js b/scripts/units/unit.js similarity index 100% rename from sources/scripts/units/unit.js rename to scripts/units/unit.js diff --git a/sources/scripts/units/value.js b/scripts/units/value.js similarity index 100% rename from sources/scripts/units/value.js rename to scripts/units/value.js diff --git a/sources/scripts/units/variable.js b/scripts/units/variable.js similarity index 100% rename from sources/scripts/units/variable.js rename to scripts/units/variable.js diff --git "a/sources/media/fonts/Icon\r" "b/sources/media/fonts/Icon\r" deleted file mode 100644 index e69de29..0000000 diff --git "a/sources/media/graphics/Icon\r" "b/sources/media/graphics/Icon\r" deleted file mode 100644 index e69de29..0000000 diff --git "a/sources/media/icons/Icon\r" "b/sources/media/icons/Icon\r" deleted file mode 100644 index e69de29..0000000