From 0ba58b5832c04b13eca3291fd327a0866546a3fa Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Thu, 6 Apr 2017 12:15:45 -1000 Subject: [PATCH] Updated Cover --- README.md | 3 --- presets/template.cover.rin | 29 ++++++++++++++++++++++------- scripts/modules/type.js | 4 ++-- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 44dd844..b906885 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,5 @@ Enjoy Expand logs ? Interrog Inline Help - / Load - Load .rin files, instead of "Presets" - Load default.rin on startup * Eye Swatches, handle all colors \ No newline at end of file diff --git a/presets/template.cover.rin b/presets/template.cover.rin index 417e19e..3ae5a5c 100644 --- a/presets/template.cover.rin +++ b/presets/template.cover.rin @@ -1,17 +1,32 @@ terminal.display hide ; frame.resize 700x700 ; +layer.select main ; layer.fill #ffcc00 ; -brush:color #000000 ; magnet.grid 10x10 4,4 ; -frame.select main ; +brush:color #000000 ; +magnet.grid 10x10 4,4 ; path:line_color black ; path:line_width 20 ; path:line_cap butt ; -path.stroke M200,400 a40,40 0 0,1 40,40 a-40,40 0 0,1 -40,40 l-40,0 a-40,-40 0 0,1 -40,-40 a40,-40 0 0,1 40,-40 l40,0 M280,490 l0,-90 l60,0 a20,20 0 0,1 20,20 a-20,20 0 0,1 -20,20 l-60,0 M390,400 l70,0 a20,20 0 0,1 20,20 a-20,20 0 0,1 -20,20 l-40,0 a-20,20 0 0,0 -20,20 l0,20 l90,0 M520,390 l0,30 a20,20 0 0,0 20,20 l60,0 M600,390 l0,100 ; +path.stroke M320,400 a40,40 0 0,1 40,40 a-40,40 0 0,1 -40,40 l-40,0 a-40,-40 0 0,1 -40,-40 a40,-40 0 0,1 40,-40 l40,0 M120,490 l0,-90 l60,0 a20,20 0 0,1 20,20 a-20,20 0 0,1 -20,20 l-60,0 M390,400 l70,0 a20,20 0 0,1 20,20 a-20,20 0 0,1 -20,20 l-40,0 a-20,20 0 0,0 -20,20 l0,20 l90,0 M520,390 l0,30 a20,20 0 0,0 20,20 l60,0 M600,390 l0,100 ; path:line_color #ffcc00 ; path:line_cap round ; path:line_width 1 ; -path.stroke M200,400 a40,40 0 0,1 40,40 a-40,40 0 0,1 -40,40 l-40,0 a-40,-40 0 0,1 -40,-40 a40,-40 0 0,1 40,-40 l40,0 M280,490 l0,-90 l60,0 a20,20 0 0,1 20,20 a-20,20 0 0,1 -20,20 l-60,0 M390,400 l70,0 a20,20 0 0,1 20,20 a-20,20 0 0,1 -20,20 l-40,0 a-20,20 0 0,0 -20,20 l0,20 l90,0 M520,390 l0,30 a20,20 0 0,0 20,20 l60,0 M600,390 l0,100 ; +path.stroke M320,400 a40,40 0 0,1 40,40 a-40,40 0 0,1 -40,40 l-40,0 a-40,-40 0 0,1 -40,-40 a40,-40 0 0,1 40,-40 l40,0 M120,490 l0,-90 l60,0 a20,20 0 0,1 20,20 a-20,20 0 0,1 -20,20 l-60,0 M390,400 l70,0 a20,20 0 0,1 20,20 a-20,20 0 0,1 -20,20 l-40,0 a-20,20 0 0,0 -20,20 l0,20 l90,0 M520,390 l0,30 a20,20 0 0,0 20,20 l60,0 M600,390 l0,100 ; +type.write:size 40 ; +type:color #FFFFFF ; +type:font DIN Light ; +type.write 105,540 "SUPERWORKER" ; type.write:size 20 ; -type.write 110,540 "SUPERWORKER" ; -type.write:size 20 ; -type.write 110,560 "オフィス" ; \ No newline at end of file +type:color #000000 ; +type.write 105,570 "オフィス" ; +type.write:size 10 ; +type:font DIN Medium ; +type.write 110,620 "01" ; +type.write 240,620 "02" ; +type.write 370,620 "03" ; +type:font DIN ; +type.write 130,620 "HIPHOP" ; +type.write 260,620 "DISCO" ; +type.write 390,620 "TECHNO" ; +source.load /nataniev.small.white.svg 100,70 80x80 ; +magnet.grid 1x1 4,4 ; diff --git a/scripts/modules/type.js b/scripts/modules/type.js index b1ecd41..6ea6def 100644 --- a/scripts/modules/type.js +++ b/scripts/modules/type.js @@ -14,13 +14,13 @@ function Type(rune) var text = params.text() ? params.text() : "Placeholder"; var position = params.position() ? params.position() : new Position(40,80); - var color = params.color() ? params.color() :new Color("#ffffff"); + var color = this.settings["color"]; var size = this.settings["size"]; var font = this.settings["font"]; var target_layer = preview ? this.layer : ronin.frame.active_layer; target_layer.context().font = size+"px "+font; - target_layer.context().fillStyle = color.hex; + target_layer.context().fillStyle = color; target_layer.context().fillText(text,position.x,position.y); console.log(target_layer.context());