diff --git a/index.html b/index.html
index dd0e2a5..ab39a75 100644
--- a/index.html
+++ b/index.html
@@ -10,12 +10,11 @@
+
+
-
-
-
diff --git a/scripts/guide.js b/scripts/guide.js
deleted file mode 100644
index 598b0d4..0000000
--- a/scripts/guide.js
+++ /dev/null
@@ -1,48 +0,0 @@
-function Guide(position = new Position(),rect = new Rect(),color = new Color())
-{
- this.position = position;
- this.rect = rect;
- this.color = color;
-
- this.draw = function(context)
- {
- context.beginPath();
-
- if((this.position.x < 0 || this.position.y < 0) && (this.rect.w > 0 || this.rect.h > 0)){
- var new_x = this.position.x < 0 ? canvas.width - Math.abs(this.position.x) - this.rect.w : this.position.x;
- var new_y = this.position.y < 0 ? canvas.height - Math.abs(this.position.y) - this.rect.h : this.position.y;
- context.moveTo(new_x,new_y);
- context.lineTo(new_x + this.rect.w,new_y);
- context.lineTo(new_x + this.rect.w,new_y + this.rect.h);
- context.lineTo(new_x,new_y + this.rect.h);
- context.lineTo(new_x,new_y);
- }
- else if(this.position.x > 0 && this.position.y > 0 && (this.rect.w > 0 || this.rect.h > 0)){
- context.moveTo(this.position.x,this.position.y);
- context.lineTo(this.position.x + this.rect.w,this.position.y);
- context.lineTo(this.position.x + this.rect.w,this.position.y + this.rect.h);
- context.lineTo(this.position.x,this.position.y + this.rect.h);
- context.lineTo(this.position.x,this.position.y);
- }
- else if(this.position.x > 0 && this.position.y > 0){
- context.moveTo(this.position.x,this.position.y);
- context.lineTo(this.position.x + 10,this.position.y);
- context.lineTo(this.position.x,this.position.y + 10);
- context.lineTo(this.position.x,this.position.y);
- }
- else if(this.position.x > 0 && this.position.y === 0){
- context.moveTo(this.position.x,0);
- context.lineTo(this.position.x,canvas.height);
- }
- else if(this.position.x === 0 && this.position.y > 0){
- context.moveTo(0,this.position.y);
- context.lineTo(canvas.width,this.position.y);
- }
-
- context.lineCap="round";
- context.lineWidth = 1;
- context.strokeStyle = this.color.rgba();
- context.stroke();
- context.closePath();
- }
-}
\ No newline at end of file
diff --git a/scripts/main.js b/scripts/main.js
index a342699..9bcbdce 100644
--- a/scripts/main.js
+++ b/scripts/main.js
@@ -3,51 +3,26 @@ var context = canvas.getContext('2d');
var ronin = new Ronin();
ronin.canvas.element = canvas;
+
ronin.overlay.element = document.getElementById('overlay');
ronin.overlay.context().imageSmoothingEnabled = false;
-
-
-
-
-
-
ronin.element = document.getElementById('ronin');
-
-// var brush = new Brush();
-
-
-
-
var commander = new Commander(document.getElementById("commander"),document.getElementById("commander_input"));
document.addEventListener('mousemove', function(e) {
- // brush.draw(e);
+ ronin.brush.draw(e);
}, false);
document.addEventListener('mousedown', function(e) {
if(e.which != 1){ return; }
- // brush.draw_start(e);
+ ronin.brush.draw_start(e);
}, false);
document.addEventListener('mouseup', function(e) {
- // brush.draw_stop(e);
+ ronin.brush.draw_stop(e);
}, false);
var keyboard = new Keyboard();
-document.onkeyup = function myFunction(){ keyboard.listen(event); };
-
-/* brush experiments
-
-var mirror_test = new Pointer();
-mirror_test.mirror = new Position(200,10);
-brush.add_pointer(mirror_test);
-
-var mirror_test2 = new Pointer(new Position(0,10));
-mirror_test2.mirror = new Position(200,0);
-brush.add_pointer(mirror_test2);
-
-brush.add_pointer(new Pointer(new Position(0,10)));
-
-*/
\ No newline at end of file
+document.onkeyup = function myFunction(){ keyboard.listen(event); };
\ No newline at end of file
diff --git a/scripts/brush.js b/scripts/ronin.brush.js
similarity index 100%
rename from scripts/brush.js
rename to scripts/ronin.brush.js
diff --git a/scripts/pointer.js b/scripts/ronin.brush.pointer.js
similarity index 92%
rename from scripts/pointer.js
rename to scripts/ronin.brush.pointer.js
index 8c8c8bc..933a6c0 100644
--- a/scripts/pointer.js
+++ b/scripts/ronin.brush.pointer.js
@@ -36,7 +36,7 @@ function Pointer(offset = new Position(), color = new Color('000000'))
else if(this.mirror && this.mirror.y > 0){
return new Position((brush.position.x + this.offset.x), this.mirror.y - (brush.position.y + this.offset.y));
}
- return new Position(brush.position.x + this.offset.x, brush.position.y + this.offset.y);
+ return new Position(ronin.brush.position.x + this.offset.x, ronin.brush.position.y + this.offset.y);
}
this.start = function()
diff --git a/scripts/ronin.js b/scripts/ronin.js
index 08a0b9c..37a162f 100644
--- a/scripts/ronin.js
+++ b/scripts/ronin.js
@@ -3,6 +3,7 @@ function Ronin()
this.element = null;
this.canvas = new Canvas();
this.overlay = new Overlay();
+ this.brush = new Brush();
this.load_image = function(p)
{
diff --git a/scripts/unit.position.js b/scripts/unit.position.js
index 00a9d91..24ba1f1 100644
--- a/scripts/unit.position.js
+++ b/scripts/unit.position.js
@@ -1,9 +1,15 @@
-function Position(position_str)
+function Position(position_str = "0,0",y = null)
{
this.position_str = position_str;
- this.x = parseFloat(this.position_str.split(",")[0]);
- this.y = parseFloat(this.position_str.split(",")[1]);
+ this.x = y ? position_str : parseFloat(this.position_str.split(",")[0]);
+ this.y = y ? y : parseFloat(this.position_str.split(",")[1]);
+
+ this.update = function(x,y)
+ {
+ this.x = x;
+ this.y = y;
+ }
this.is_equal = function(target)
{