dakedres/ronin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved Type

Browse Source
This commit is contained in:
Devine Lu Linvega
2017-03-28 13:56:00 -07:00
parent a8a23736bf
commit cc37e3ff98
27 changed files with 154 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/filters/balance.js
View File

@@ -9,7 +9,7 @@ function Filter_Balance()
if(!cmd.color()){ return; }
if(!cmd.color().rgb()){ return; }
this.draw(ronin.surface.active_layer.context(),cmd.color().rgb());
this.draw(ronin.frame.active_layer.context(),cmd.color().rgb());
}
this.preview = function(cmd)
@@ -23,12 +23,12 @@ function Filter_Balance()
this.draw = function(context = this.context(), color_rgb)
{
var imageObj = new Image();
imageObj.src = ronin.surface.active_layer.element.toDataURL('image/png');
imageObj.src = ronin.frame.active_layer.element.toDataURL('image/png');
var w = ronin.surface.settings["size"].width;
var h = ronin.surface.settings["size"].height;
var w = ronin.frame.settings["size"].width;
var h = ronin.frame.settings["size"].height;
var originalData = ronin.surface.active_layer.context().getImageData(0, 0, w*2, h*2);
var originalData = ronin.frame.active_layer.context().getImageData(0, 0, w*2, h*2);
var data = originalData.data;
var r = (color_rgb.r / 255) + 0.5;

10
scripts/filters/chromatic.js
View File

@@ -8,7 +8,7 @@ function Filter_Chromatic()
this.render = function(cmd)
{
var position = cmd.position() ? cmd.position() : new Position(ronin.surface.settings["size"].width,ronin.surface.settings["size"].height);
var position = cmd.position() ? cmd.position() : new Position(ronin.frame.settings["size"].width,ronin.frame.settings["size"].height);
var value = cmd.value() ? cmd.value().float : 5;
ronin.overlay.clear();
@@ -26,13 +26,13 @@ function Filter_Chromatic()
this.draw = function(context = this.context(), value, position)
{
var w = ronin.surface.settings["size"].width;
var h = ronin.surface.settings["size"].height;
var w = ronin.frame.settings["size"].width;
var h = ronin.frame.settings["size"].height;
//no longer letting you set how far each chanel is shifted, not sure how to receive extra data any more
var s = {r:value,g:value*.5,b:0};
var context = ronin.surface.active_layer.context();
var context = ronin.frame.active_layer.context();
//now need two imagedatas to sample off of, for some reason I cant just dump the new pixels into an empty array :/
var originalData = context.getImageData(0, 0, w*2, h*2);
@@ -61,7 +61,7 @@ function Filter_Chromatic()
this.set_color(imageData, c, i,j);
}
}
ronin.surface.active_layer.clear();
ronin.frame.active_layer.clear();
context.putImageData(imageData, 0, 0);
}
}

4
scripts/filters/filter.js
View File

@@ -73,11 +73,11 @@ function Filter()
this.context = function()
{
return ronin.surface.active_layer.context();
return ronin.frame.active_layer.context();
}
this.pixels = function()
{
return ronin.surface.active_layer.context().getImageData(0,0,ronin.surface.settings["size"].width * 2,ronin.surface.settings["size"].height * 2);
return ronin.frame.active_layer.context().getImageData(0,0,ronin.frame.settings["size"].width * 2,ronin.frame.settings["size"].height * 2);
}
}

12
scripts/filters/grey.js
View File

@@ -7,10 +7,10 @@ function Filter_Grey()
this.render = function(cmd)
{
if(cmd.color() && cmd.color().rgb()){
this.draw(ronin.surface.active_layer.context(),cmd.color().rgb());
this.draw(ronin.frame.active_layer.context(),cmd.color().rgb());
}
else{
this.draw(ronin.surface.active_layer.context());
this.draw(ronin.frame.active_layer.context());
}
}
@@ -27,12 +27,12 @@ function Filter_Grey()
this.draw = function(context = this.context(), color_rgb = new Color("#36ba0e").rgb())
{
var imageObj = new Image();
imageObj.src = ronin.surface.active_layer.element.toDataURL('image/png');
imageObj.src = ronin.frame.active_layer.element.toDataURL('image/png');
var w = ronin.surface.settings["size"].width;
var h = ronin.surface.settings["size"].height;
var w = ronin.frame.settings["size"].width;
var h = ronin.frame.settings["size"].height;
var originalData = ronin.surface.active_layer.context().getImageData(0, 0, w*2, h*2);
var originalData = ronin.frame.active_layer.context().getImageData(0, 0, w*2, h*2);
var data = originalData.data;
var _r = (color_rgb.r / 255);

10
scripts/filters/invert.js
View File

@@ -6,11 +6,11 @@ function Filter_Invert()
this.render = function(cmd)
{
var imageObj = new Image();
imageObj.src = ronin.surface.active_layer.element.toDataURL('image/png');
imageObj.src = ronin.frame.active_layer.element.toDataURL('image/png');
var w = ronin.surface.settings["size"].width;
var h = ronin.surface.settings["size"].height;
var context = ronin.surface.active_layer.context();
var w = ronin.frame.settings["size"].width;
var h = ronin.frame.settings["size"].height;
var context = ronin.frame.active_layer.context();
var originalData = context.getImageData(0, 0, w*2, h*2);
var data = originalData.data;
@@ -21,7 +21,7 @@ function Filter_Invert()
data[i + 2] = 255 - data[i + 2];
}
ronin.surface.active_layer.clear();
ronin.frame.active_layer.clear();
context.putImageData(originalData, 0, 0);
}
}

8
scripts/filters/rotate.js
View File

@@ -5,7 +5,7 @@ function Filter_Rotate()
this.render = function(cmd)
{
var position = cmd.position() ? cmd.position() : new Position(ronin.surface.settings["size"].width/2,ronin.surface.settings["size"].height/2);
var position = cmd.position() ? cmd.position() : new Position(ronin.frame.settings["size"].width/2,ronin.frame.settings["size"].height/2);
var angle = cmd.angle() ? cmd.angle().degrees : 90;
ronin.overlay.clear();
@@ -23,12 +23,12 @@ function Filter_Rotate()
this.draw = function(context = this.context(), angle, position)
{
var w = ronin.surface.settings["size"].width;
var h = ronin.surface.settings["size"].height;
var w = ronin.frame.settings["size"].width;
var h = ronin.frame.settings["size"].height;
ronin.overlay.context().drawImage(context.canvas,0,0,w,h);
ronin.surface.active_layer.clear();
ronin.frame.active_layer.clear();
context.save();
context.translate(position.x,position.y);

10
scripts/filters/sharpen.js
View File

@@ -7,11 +7,11 @@ function Filter_Sharpen()
this.render = function(cmd)
{
var imageObj = new Image();
imageObj.src = ronin.surface.active_layer.element.toDataURL('image/png');
imageObj.src = ronin.frame.active_layer.element.toDataURL('image/png');
var w = ronin.surface.settings["size"].width;
var h = ronin.surface.settings["size"].height;
var context = ronin.surface.active_layer.context();
var w = ronin.frame.settings["size"].width;
var h = ronin.frame.settings["size"].height;
var context = ronin.frame.active_layer.context();
var originalData = context.getImageData(0, 0, w*2, h*2);
var data = originalData.data;
@@ -36,7 +36,7 @@ function Filter_Sharpen()
newImage.data[i+2] = parseInt(average.b);
}
ronin.surface.active_layer.clear();
ronin.frame.active_layer.clear();
context.putImageData(newImage, 0, 0);
}

6
scripts/filters/stencil.js
View File

@@ -9,7 +9,7 @@ function Filter_Stencil()
var color = cmd.color() ? cmd.color().hex : "#ffffff";
ronin.render.layer.clear();
this.draw(ronin.surface.active_layer.context(),angle,color);
this.draw(ronin.frame.active_layer.context(),angle,color);
}
this.preview = function(cmd)
@@ -23,8 +23,8 @@ function Filter_Stencil()
this.draw = function(context = this.context(), angle, color)
{
var w = ronin.surface.settings["size"].width;
var h = ronin.surface.settings["size"].height;
var w = ronin.frame.settings["size"].width;
var h = ronin.frame.settings["size"].height;
context.translate(w/2,h/2);