From 0dbb49b70cbf6abcda1bd0dcf65f0898369edaf3 Mon Sep 17 00:00:00 2001 From: Tanasart Date: Sat, 26 Oct 2024 07:53:22 +0700 Subject: [PATCH] [Scale Algorithm] Add rotation to cleanedge algorithm. --- scripts/node_registry/node_registry.gml | 2 +- scripts/node_scale_algo/node_scale_algo.gml | 19 +++++++++++++------ .../sh_scale_cleanedge/sh_scale_cleanedge.fsh | 6 +++++- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/scripts/node_registry/node_registry.gml b/scripts/node_registry/node_registry.gml index b467aad23..c69170aa9 100644 --- a/scripts/node_registry/node_registry.gml +++ b/scripts/node_registry/node_registry.gml @@ -562,7 +562,7 @@ function __initNodes() { ds_list_add(transform, "Transformations"); addNodeObject(transform, "Transform", s_node_transform, "Node_Transform", [1, Node_Transform], ["move", "rotate", "scale"], "Move, rotate, and scale image."); addNodeObject(transform, "Scale", s_node_scale, "Node_Scale", [1, Node_Scale], ["resize"], "Simple node for scaling image."); - addNodeObject(transform, "Scale Algorithm", s_node_scale_algo, "Node_Scale_Algo", [0, Node_create_Scale_Algo], ["scale2x", "scale3x", "cleanshape"], "Scale image using scale2x, scale3x algorithm."); + addNodeObject(transform, "Scale Algorithm", s_node_scale_algo, "Node_Scale_Algo", [0, Node_create_Scale_Algo], ["scale2x", "scale3x", "cleanedge"], "Scale image using pixel-art scaling algorithm."); addNodeObject(transform, "Flip", s_node_flip, "Node_Flip", [1, Node_Flip], ["mirror"], "Flip image horizontally or vertically."); addNodeObject(transform, "Offset", s_node_offset, "Node_Offset", [1, Node_Offset], ["shift"], "Shift image with tiling."); diff --git a/scripts/node_scale_algo/node_scale_algo.gml b/scripts/node_scale_algo/node_scale_algo.gml index 8b6e8ffdf..8bd78ca8a 100644 --- a/scripts/node_scale_algo/node_scale_algo.gml +++ b/scripts/node_scale_algo/node_scale_algo.gml @@ -3,9 +3,9 @@ function Node_create_Scale_Algo(_x, _y, _group = noone, _param = {}) { var node = new Node_Scale_Algo(_x, _y, _group).skipDefault(); switch(query) { - case "scale2x" : node.inputs[1].setValue(0); break; - case "scale3x" : node.inputs[1].setValue(1); break; - case "cleanshape" : node.inputs[1].setValue(2); break; + case "scale2x" : node.inputs[1].setValue(0); break; + case "scale3x" : node.inputs[1].setValue(1); break; + case "cleanedge" : node.inputs[1].setValue(2); break; } return node; @@ -30,11 +30,13 @@ function Node_Scale_Algo(_x, _y, _group = noone) : Node_Processor(_x, _y, _group newInput(5, nodeValue_Float("Scale", self, 4)); + newInput(6, nodeValue_Rotation("Rotation", self, 0)); + newOutput(0, nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone)); input_display_list = [ 3, ["Surfaces", false], 0, - ["Scale", false], 1, 2, 4, 5, + ["Scale", false], 1, 2, 4, 5, 6, ] attribute_surface_depth(); @@ -46,6 +48,7 @@ function Node_Scale_Algo(_x, _y, _group = noone) : Node_Processor(_x, _y, _group var _atlas = is_instanceof(_surf, SurfaceAtlas); inputs[4].setVisible(_atlas); inputs[5].setVisible(_type == 2); + inputs[6].setVisible(_type == 2); } static processData = function(_outSurf, _data, _output_index, _array_index) { @@ -53,6 +56,7 @@ function Node_Scale_Algo(_x, _y, _group = noone) : Node_Processor(_x, _y, _group var algo = _data[1]; var _atlS = _data[4]; var _scal = _data[5]; + var _rota = _data[6]; var ww = surface_get_width_safe(inSurf); var hh = surface_get_height_safe(inSurf); var cDep = attrDepth(); @@ -73,6 +77,7 @@ function Node_Scale_Algo(_x, _y, _group = noone) : Node_Processor(_x, _y, _group _surf = surface_verify(_surf, sw, sh, cDep); break; + case 1 : shader = sh_scale3x; sc = 3; @@ -81,6 +86,7 @@ function Node_Scale_Algo(_x, _y, _group = noone) : Node_Processor(_x, _y, _group _surf = surface_verify(_surf, sw, sh, cDep); break; + case 2 : shader = sh_scale_cleanedge; sc = _scal; @@ -88,15 +94,16 @@ function Node_Scale_Algo(_x, _y, _group = noone) : Node_Processor(_x, _y, _group hh *= sc; _surf = surface_verify(_surf, ww, hh, cDep); - // gpu_set_texfilter(true); break; + } surface_set_shader(_surf, shader); shader_set_f("dimension", [ ww, hh ]); shader_set_f("tol", _data[2]); shader_set_f("similarThreshold", _data[2]); - shader_set_f("scale", _data[5]); + shader_set_f("scale", _scal); + shader_set_f("rotation", degtorad(_rota)); draw_surface_ext_safe(_data[0], 0, 0, sc, sc, 0, c_white, 1); surface_reset_shader(); diff --git a/shaders/sh_scale_cleanedge/sh_scale_cleanedge.fsh b/shaders/sh_scale_cleanedge/sh_scale_cleanedge.fsh index 1039b16fe..e826e10c1 100644 --- a/shaders/sh_scale_cleanedge/sh_scale_cleanedge.fsh +++ b/shaders/sh_scale_cleanedge/sh_scale_cleanedge.fsh @@ -34,6 +34,7 @@ varying vec4 v_vColour; uniform vec2 dimension; uniform float scale; +uniform float rotation; //the color with the highest priority. // other colors will be tested based on distance to this @@ -295,8 +296,11 @@ float round(float val) { return fract(val) > 0.5? ceil(val) : floor(val); } vec2 round(vec2 vec) { return vec2(round(vec.x), round(vec.y)); } void main() { + float ang = rotation; vec2 size = dimension + 0.0001; - vec2 px = v_vTexcoord * size / scale; + vec2 px = (v_vTexcoord - .5) * mat2(cos(ang), -sin(ang), sin(ang), cos(ang)) + .5; + px = px * size / scale; + vec2 local = fract(px); px = ceil(px);