Hey
diff --git a/scripts/commander.js b/scripts/commander.js
index f476c83..5e94696 100644
--- a/scripts/commander.js
+++ b/scripts/commander.js
@@ -86,6 +86,9 @@ function Commander(element,element_input)
ronin.zoom.passive(this.cmd);
ronin.module = ronin.zoom;
break;
+ case "$":
+ ronin.module = ronin.file;
+ break;
case ":":
ronin.filter.passive(this.cmd);
ronin.module = ronin.filter;
diff --git a/scripts/main.js b/scripts/main.js
index c9c9485..5333f54 100644
--- a/scripts/main.js
+++ b/scripts/main.js
@@ -1,31 +1,20 @@
-var canvas = document.getElementById('myCanvas');
-var context = canvas.getContext('2d');
+
+// Juchecore
var ronin = new Ronin();
-ronin.canvas.element = canvas;
-
+ronin.canvas.element = document.getElementById('workspace');
ronin.overlay.element = document.getElementById('overlay');
-ronin.overlay.context().imageSmoothingEnabled = false;
-
-
ronin.hint.element = document.getElementById('commander_hint');
-ronin.element = document.getElementById('ronin');
-
var commander = new Commander(document.getElementById("commander"),document.getElementById("commander_input"));
-document.addEventListener('mousemove', function(e) {
- ronin.brush.draw(e);
-}, false);
+// Interactive
-document.addEventListener('mousedown', function(e) {
- if(e.which != 1){ return; }
- ronin.brush.draw_start(e);
-}, false);
-
-document.addEventListener('mouseup', function(e) {
- ronin.brush.draw_stop(e);
-}, false);
+document.addEventListener('mousemove', function(e) { ronin.brush.draw(e); }, false);
+document.addEventListener('mousedown', function(e) { if(e.which != 1){ return; } ronin.brush.draw_start(e); }, false);
+document.addEventListener('mouseup', function(e) { ronin.brush.draw_stop(e); }, false);
var keyboard = new Keyboard();
-document.onkeyup = function myFunction(){ keyboard.listen(event); };
\ No newline at end of file
+document.onkeyup = function myFunction(){ keyboard.listen(event); };
+
+// Done.
diff --git a/scripts/ronin.brush.pointer.js b/scripts/ronin.brush.pointer.js
index b661f05..b052503 100644
--- a/scripts/ronin.brush.pointer.js
+++ b/scripts/ronin.brush.pointer.js
@@ -17,21 +17,21 @@ function Pointer(offset = new Position(), color = new Color('000000'))
position.y += (Math.random() * this.noise) - (this.noise/2);
}
- context.beginPath();
- context.moveTo(this.position_prev.x,this.position_prev.y);
- context.lineTo(position.x,position.y);
- context.lineCap="round";
- context.lineWidth = this.thickness();
- context.strokeStyle = ronin.brush.color.rgba();
- context.stroke();
- context.closePath();
+ ronin.canvas.context().beginPath();
+ ronin.canvas.context().moveTo(this.position_prev.x,this.position_prev.y);
+ ronin.canvas.context().lineTo(position.x,position.y);
+ ronin.canvas.context().lineCap="round";
+ ronin.canvas.context().lineWidth = this.thickness();
+ ronin.canvas.context().strokeStyle = ronin.brush.color.rgba();
+ ronin.canvas.context().stroke();
+ ronin.canvas.context().closePath();
this.position_prev = position;
}
this.erase = function()
{
- context.clearRect(this.position().x - (ronin.brush.size/2), this.position().y - (ronin.brush.size/2), ronin.brush.size, ronin.brush.size);
+ ronin.canvas.context().clearRect(this.position().x - (ronin.brush.size/2), this.position().y - (ronin.brush.size/2), ronin.brush.size, ronin.brush.size);
}
this.thickness = function()
diff --git a/scripts/ronin.canvas.js b/scripts/ronin.canvas.js
index 6729ad8..851b4fd 100644
--- a/scripts/ronin.canvas.js
+++ b/scripts/ronin.canvas.js
@@ -6,7 +6,7 @@ function Canvas(element)
this.active = function(cmd)
{
- if(cmd.bang()){ this.context().clearRect(0, 0, canvas.width, canvas.height); }
+ if(cmd.bang()){ this.context().clearRect(0, 0, this.element.width, this.element.height); }
if(cmd.rect()){
this.resize(cmd.rect());
@@ -15,7 +15,7 @@ function Canvas(element)
if(cmd.color()){
this.context().beginPath();
- this.context().rect(0, 0, canvas.width, canvas.height);
+ this.context().rect(0, 0, this.element.width, this.element.height);
this.context().fillStyle = cmd.color().hex;
this.context().fill();
}
diff --git a/scripts/ronin.file.js b/scripts/ronin.file.js
index 165b91e..8e7c5b2 100644
--- a/scripts/ronin.file.js
+++ b/scripts/ronin.file.js
@@ -20,7 +20,7 @@ function File()
base_image.src = cmd.value() && this.storage[cmd.value()] ? this.storage[cmd.value()] : cmd.path();
base_image.onload = function(){
position.normalize(cmd.rect());
- context.drawImage(base_image, position.x, position.y, cmd.rect().width, cmd.rect().height);
+ ronin.canvas.context().drawImage(base_image, position.x, position.y, cmd.rect().width, cmd.rect().height);
}
}
@@ -50,11 +50,11 @@ function File()
this.save = function(cmd)
{
if(cmd.value() > 0){
- this.storage[cmd.value()] = canvas.toDataURL("image/png");
+ this.storage[cmd.value()] = ronin.canvas.element.toDataURL("image/png");
}
else{
- var d=canvas.toDataURL("image/png");
- var w=window.open('about:blank','image from canvas');
+ var d = ronin.canvas.element.toDataURL("image/png");
+ var w = window.open('about:blank','image from canvas');
w.document.write("