From efc8ac170f058493acb4cff70d86c87a943bd603 Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Wed, 11 Jan 2017 10:11:38 -0700 Subject: [PATCH] Fixed issue with export --- README.md | 7 ++++++- scripts/modules/file.save.js | 5 +++-- scripts/modules/surface.js | 22 +++++++++++----------- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index bb71829..e8752ea 100644 --- a/README.md +++ b/README.md @@ -118,4 +118,9 @@ rate=10 ; variable: rate = 10 > 2,2;> 4,4;> 6,6;> 8,8 # Symmetric Light > 1,1 600x;> 2,2 600x;> 3,3 600x;> 4,4 600x -``` \ No newline at end of file +``` + +### Twitter export & Watermark +``` +# 1280x800 ; / assets/photo.jpg 1280x 0,0 ; / assets/hundredrabbits.png 60x60 20,720 +``` diff --git a/scripts/modules/file.save.js b/scripts/modules/file.save.js index 05eab70..ad647a0 100644 --- a/scripts/modules/file.save.js +++ b/scripts/modules/file.save.js @@ -9,9 +9,10 @@ function FileSave(rune) var n = "Ronin Export"; var f = cmd.variable("format"); var d = ronin.surface.merge(); - d = ronin.surface.layers["render"].element.toDataURL('image/png'); - ronin.surface.layers["render"].clear(); + d = ronin.surface.active_layer.element.toDataURL('image/png'); + // // ronin.surface.layers["render"].clear(); var w = window.open('about:blank','image from canvas'); + // w.document.write("hello") w.document.write(""+(n ? n : "Untitled")+""); } diff --git a/scripts/modules/surface.js b/scripts/modules/surface.js index 953074b..8f2455f 100644 --- a/scripts/modules/surface.js +++ b/scripts/modules/surface.js @@ -134,18 +134,18 @@ function Surface(rune) this.merge = function() { - this.render_layer = this.layers["render"]; + // this.render_layer = this.layers["render"]; - var a = []; - Object.keys(ronin.surface.layers).forEach(function (key) { - if(key != "render"){ - a.push(ronin.surface.layers[key]); - } - }); - for (i = a.length; i > 0 ; i--) { - ronin.surface.render_layer.context().drawImage(a[i-1].context().canvas,0,0,this.size.width,this.size.height); - } - return this.render_layer; + // var a = []; + // Object.keys(ronin.surface.layers).forEach(function (key) { + // if(key != "render"){ + // a.push(ronin.surface.layers[key]); + // } + // }); + // for (i = a.length; i > 0 ; i--) { + // ronin.surface.render_layer.context().drawImage(a[i-1].context().canvas,0,0,this.size.width,this.size.height); + // } + return this.context(); } // Cursor