diff --git a/index.html b/index.html index 909d800..9d274a5 100644 --- a/index.html +++ b/index.html @@ -22,7 +22,6 @@ - diff --git a/scripts/modules/brush.js b/scripts/modules/brush.js index f22e734..800e2ca 100644 --- a/scripts/modules/brush.js +++ b/scripts/modules/brush.js @@ -28,8 +28,6 @@ function Brush(rune) if(cmd.value()){ this.size = cmd.value().float; } - - this.update_variables(cmd); } this.passive = function(cmd) diff --git a/scripts/modules/cursor.js b/scripts/modules/cursor.js index df59a7c..6878ec7 100644 --- a/scripts/modules/cursor.js +++ b/scripts/modules/cursor.js @@ -24,9 +24,7 @@ function Cursor(rune) this.active = function(cmd) { - console.log("!"); if(cmd.bang()){ - console.log("??"); this.magnetism = null; if(this.layer){ this.layer.remove(this); } return; diff --git a/scripts/modules/eraser.js b/scripts/modules/eraser.js deleted file mode 100644 index 973ccf4..0000000 --- a/scripts/modules/eraser.js +++ /dev/null @@ -1,79 +0,0 @@ -function Eraser(rune) -{ - Module.call(this,rune); - - this.parameters = [Value]; - this.size = 5; - - // Module - - this.position_prev = null; - - this.draw = function() - { - if(!this.position_prev){this.position_prev = ronin.cursor.position; } - if(ronin.brush.size < 0){ this.erase(); return; } - - var position = ronin.cursor.position; - - this.distance += position.distance_to(this.position_prev); - - ronin.surface.context().beginPath(); - ronin.surface.context().globalCompositeOperation="destination-out"; - ronin.surface.context().moveTo(this.position_prev.x,this.position_prev.y); - ronin.surface.context().lineTo(position.x,position.y); - ronin.surface.context().lineCap="round"; - ronin.surface.context().lineWidth = this.size; - ronin.surface.context().strokeStyle = new Color("#ff0000").rgba(); - ronin.surface.context().stroke(); - ronin.surface.context().closePath(); - - this.position_prev = position; - } - - this.active = function(cmd) - { - if(cmd.value()){ - this.size = cmd.value().float; - } - } - - this.passive = function(cmd) - { - - } - - this.widget_cursor = function() - { - return ". "+this.size; - } - - // Cursor - - this.is_drawing = false; - - this.mouse_down = function(position) - { - this.is_drawing = true; - this.position_prev = null; - - ronin.stroke.new_stroke(); - } - - this.mouse_move = function(position) - { - if(this.is_drawing === false){ return; } - - this.draw(); - - ronin.stroke.append_stroke(position); - } - - this.mouse_up = function(position) - { - this.is_drawing = false; - this.position_prev = null; - - ronin.stroke.save_stroke("eraser"); - } -} \ No newline at end of file diff --git a/scripts/modules/module.js b/scripts/modules/module.js index 174abf6..082678b 100644 --- a/scripts/modules/module.js +++ b/scripts/modules/module.js @@ -28,11 +28,12 @@ function Module(rune) { } - this.update_variables = function(cmd) + this.set_variables = function(cmd) { for (var key in this.variables){ if(!cmd.variable(key)){ continue; } this.variables[key] = cmd.variable(key).value; + ronin.terminal.log(new Log(this,"Updated "+key+" with "+cmd.variable(key).value)); } } diff --git a/scripts/modules/render.js b/scripts/modules/render.js index a9b7e46..b2f0a7d 100644 --- a/scripts/modules/render.js +++ b/scripts/modules/render.js @@ -45,6 +45,12 @@ function Render(rune) h += this.collection[name].parameters[i].name+" "; } } + else if(name){ + for (var key in this.collection){ + if(name != key.substr(0,name.length)){ continue; } + h += key.substr(name.length)+" "; + } + } else{ for (var key in this.collection){ h += key+" "; diff --git a/scripts/modules/terminal.js b/scripts/modules/terminal.js index 743b32e..e0e02bf 100644 --- a/scripts/modules/terminal.js +++ b/scripts/modules/terminal.js @@ -88,6 +88,7 @@ function Terminal(rune) var cmd = new Command(content.substring(1).trim().split(" ")); if(ronin.modules[key]){ + ronin.modules[key].set_variables(cmd); ronin.modules[key].active(cmd); ronin.terminal.history.push(content); ronin.terminal.history_index = ronin.terminal.history.length-1;