mirror of
https://github.com/Ttanasart-pt/Pixel-Composer.git
synced 2024-12-23 21:46:17 +01:00
[Repeat] Add output dimension settings (same as input, constant, relative, fit content)
This commit is contained in:
Tanasart
parent
ab1f10d8fe
commit
a920ab2359
6 changed files with 225 additions and 134 deletions
|
|
@ -97,13 +97,13 @@ event_inherited();
|
|||
continue;
|
||||
}
|
||||
|
||||
var _yy = _ly + hght / 2;
|
||||
|
||||
if(clickable) {
|
||||
if(sc_content.hover && point_in_rectangle(_m[0], _m[1], 0, _ly, _dw, _ly + hght - 1)) {
|
||||
sc_content.hover_content = true;
|
||||
selecting = i;
|
||||
hov = i;
|
||||
|
||||
if(_tol) TOOLTIP = _val.tooltip;
|
||||
}
|
||||
|
||||
if(selecting == i) {
|
||||
|
|
@ -116,20 +116,32 @@ event_inherited();
|
|||
}
|
||||
}
|
||||
|
||||
if(_tol) {
|
||||
var tx = _dw - ui(12);
|
||||
var ty = _yy;
|
||||
|
||||
if(point_in_circle(_m[0], _m[1], tx, ty, ui(10))) {
|
||||
TOOLTIP = _val.tooltip;
|
||||
draw_sprite_ui(THEME.info, 0, tx, ty, .75, .75, 0, COLORS._main_icon, 1);
|
||||
|
||||
} else
|
||||
draw_sprite_ui(THEME.info, 0, tx, ty, .75, .75, 0, COLORS._main_icon, 0.75);
|
||||
}
|
||||
|
||||
if(is_string(txt)) {
|
||||
draw_set_text(font, align, fa_center, clickable? COLORS._main_text : COLORS._main_text_sub);
|
||||
if(align == fa_center) {
|
||||
var _xc = _spr? hght + (_dw - hght) / 2 : _dw / 2;
|
||||
draw_text_add(_xc, _ly + hght / 2, txt);
|
||||
draw_text_add(_xc, _yy, txt);
|
||||
|
||||
} else if(align == fa_left)
|
||||
draw_text_add(text_pad + _spr * hght, _ly + hght / 2, txt);
|
||||
draw_text_add(text_pad + _spr * hght, _yy, txt);
|
||||
|
||||
} else if(sprite_exists(txt)) {
|
||||
draw_sprite_ext(txt, i, _dw / 2, _ly + hght / 2);
|
||||
draw_sprite_ext(txt, i, _dw / 2, _yy);
|
||||
}
|
||||
|
||||
if(_spr) draw_sprite_ext(_val.spr, _val.spr_ind, ui(8) + hght / 2, _ly + hght / 2, 1, 1, 0, _val.spr_blend, 1);
|
||||
if(_spr) draw_sprite_ext(_val.spr, _val.spr_ind, ui(8) + hght / 2, _yy, 1, 1, 0, _val.spr_blend, 1);
|
||||
|
||||
_ly += hght;
|
||||
_h += hght;
|
||||
|
|
|
|||
|
|
@ -3,13 +3,14 @@
|
|||
#endregion
|
||||
|
||||
#region macro
|
||||
#macro BLEND_NORMAL gpu_set_blendmode(bm_normal);
|
||||
#macro BLEND_NORMAL gpu_set_blendmode(bm_normal); gpu_set_blendequation(bm_eq_add);
|
||||
#macro BLEND_ADD gpu_set_blendmode(bm_add);
|
||||
#macro BLEND_OVERRIDE gpu_set_blendmode_ext(bm_one, bm_zero);
|
||||
//#macro BLEND_ADD_ALPHA gpu_set_blendmode_ext_sepalpha(bm_one, bm_inv_src_alpha, bm_one, bm_one)
|
||||
|
||||
#macro BLEND_ALPHA gpu_set_blendmode_ext_sepalpha(bm_one, bm_inv_src_alpha, bm_one, bm_one);
|
||||
#macro BLEND_ALPHA_MULP gpu_set_blendmode_ext_sepalpha(bm_src_alpha, bm_inv_src_alpha, bm_one, bm_one);
|
||||
#macro BLEND_MAX gpu_set_blendmode(bm_normal); gpu_set_blendequation(bm_eq_max);
|
||||
|
||||
#macro BLEND_MULTIPLY gpu_set_blendmode_ext(bm_dest_colour, bm_zero);
|
||||
#macro BLEND_SUBTRACT gpu_set_blendmode(bm_subtract);
|
||||
|
|
|
|||
|
|
@ -214,7 +214,7 @@ function curveBox(_onModify) : widget() constructor {
|
|||
DRAW_CLEAR
|
||||
|
||||
draw_set_color(COLORS.widget_curve_line);
|
||||
draw_set_alpha(0.75);
|
||||
draw_set_alpha(0.5);
|
||||
|
||||
if(grid_show) {
|
||||
var st = max(grid_step, 0.02);
|
||||
|
|
@ -244,8 +244,6 @@ function curveBox(_onModify) : widget() constructor {
|
|||
draw_line(_px, 0, _px, ch);
|
||||
}
|
||||
|
||||
// print("");
|
||||
|
||||
if(_shf) {
|
||||
draw_set_color(merge_color(COLORS._main_icon, COLORS._main_icon_dark, 0.5));
|
||||
draw_curve(0, 0, cw, ch, _data, minx, maxx, miny, maxy, _shift, _scale);
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ function Node_Repeat(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co
|
|||
newInput(15, nodeValue("Alpha over copy", self, CONNECT_TYPE.input, VALUE_TYPE.curve, CURVE_DEF_11 ));
|
||||
|
||||
newInput(16, nodeValue_Enum_Button("Array select", self, 0, [ "Order", "Random", "Spread" ]))
|
||||
.setTooltip("Whether to select image from an array in order, at random, or spread or each image to one output.");
|
||||
.setTooltip("Whether to select image from an array in order, at random, or spread each image to its own output.");
|
||||
|
||||
newInput(17, nodeValue_Int("Seed", self, seed_random(6)))
|
||||
.setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[17].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) });
|
||||
|
|
@ -71,29 +71,29 @@ function Node_Repeat(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co
|
|||
newInput(19, nodeValue_Vec2("Column shift", self, [0, DEF_SURF_H / 2]))
|
||||
.setUnitRef(function() { return getDimension(); });
|
||||
|
||||
newInput(20, nodeValue_Float("Animator midpoint", self, 0.5))
|
||||
.setDisplay(VALUE_DISPLAY.slider, { range: [-1, 2, 0.01] });
|
||||
/* deprecated */ newInput(20, nodeValue_Float("Animator midpoint", self, 0.5))
|
||||
.setDisplay(VALUE_DISPLAY.slider, { range: [-1, 2, 0.01] });
|
||||
|
||||
newInput(21, nodeValue_Float("Animator range", self, 0.1))
|
||||
.setDisplay(VALUE_DISPLAY.slider);
|
||||
/* deprecated */ newInput(21, nodeValue_Float("Animator range", self, 0.1))
|
||||
.setDisplay(VALUE_DISPLAY.slider);
|
||||
|
||||
newInput(22, nodeValue_Vec2("Animator position", self, [ 0, 0 ]));
|
||||
/* deprecated */ newInput(22, nodeValue_Vec2("Animator position", self, [ 0, 0 ]));
|
||||
|
||||
newInput(23, nodeValue_Rotation("Animator rotation", self, 0));
|
||||
/* deprecated */ newInput(23, nodeValue_Rotation("Animator rotation", self, 0));
|
||||
|
||||
newInput(24, nodeValue_Vec2("Animator scale", self, [ 0, 0 ]));
|
||||
/* deprecated */ newInput(24, nodeValue_Vec2("Animator scale", self, [ 0, 0 ]));
|
||||
|
||||
newInput(25, nodeValue("Animator falloff", self, CONNECT_TYPE.input, VALUE_TYPE.curve, CURVE_DEF_10));
|
||||
/* deprecated */ newInput(25, nodeValue("Animator falloff", self, CONNECT_TYPE.input, VALUE_TYPE.curve, CURVE_DEF_10));
|
||||
|
||||
newInput(26, nodeValue_Enum_Button("Stack", self, 0, [ "None", "X", "Y" ]))
|
||||
.setTooltip("Place each copy next to each other, taking surface dimension into account.");
|
||||
|
||||
newInput(27, nodeValue_Color("Animator blend", self, cola(c_white)));
|
||||
/* deprecated */ newInput(27, nodeValue_Color("Animator blend", self, cola(c_white)));
|
||||
|
||||
newInput(28, nodeValue_Float("Animator alpha", self, 1))
|
||||
.setDisplay(VALUE_DISPLAY.slider);
|
||||
/* deprecated */ newInput(28, nodeValue_Float("Animator alpha", self, 1))
|
||||
.setDisplay(VALUE_DISPLAY.slider);
|
||||
|
||||
newInput(29, nodeValue_Bool("Animator", self, false))
|
||||
/* deprecated */ newInput(29, nodeValue_Bool("Animator", self, false))
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
|
@ -109,17 +109,28 @@ function Node_Repeat(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co
|
|||
|
||||
newInput(34, nodeValue_Enum_Scroll("Blend Mode", self, 0, [ "Normal", "Additive", "Maximum" ]));
|
||||
|
||||
newInput(35, nodeValue_Enum_Scroll("Output dimension type", self, OUTPUT_SCALING.constant, [
|
||||
new scrollItem("Same as input"),
|
||||
new scrollItem("Constant"),
|
||||
new scrollItem("Relative to input").setTooltip("Set dimension as a multiple of input surface."),
|
||||
new scrollItem("Fit content").setTooltip("Automatically set dimension to fit content."),
|
||||
]));
|
||||
|
||||
newInput(36, nodeValue_Vec2("Relative dimension", self, [ 1, 1 ]));
|
||||
|
||||
newInput(37, nodeValue_Padding("Padding", self, [ 0, 0, 0, 0 ]));
|
||||
|
||||
newOutput(0, nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone));
|
||||
|
||||
input_display_list = [
|
||||
["Surfaces", true], 0, 1, 16, 17,
|
||||
["Surfaces", true], 0, 35, 36, 37, 1, 16, 17,
|
||||
["Pattern", false], 3, 9, 32, 2, 18, 7, 8,
|
||||
["Path", true], 11, 12, 13,
|
||||
["Position", false], 4, 26, 19,
|
||||
["Rotation", false], 33, 5,
|
||||
["Scale", false], 6, 10,
|
||||
["Render", false], 34, 14, 30,
|
||||
["Animator", true, 29], 20, 21, 25, 22, 23, 24, 27,
|
||||
//["Animator", true, 29], 20, 21, 25, 22, 23, 24, 27,
|
||||
];
|
||||
|
||||
attribute_surface_depth();
|
||||
|
|
@ -165,7 +176,12 @@ function Node_Repeat(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co
|
|||
static processData = function(_outSurf, _data, _output_index, _array_index) {
|
||||
|
||||
var _iSrf = _data[ 0];
|
||||
var _dim = _data[ 1];
|
||||
|
||||
var _dimt = _data[35];
|
||||
var _dimc = _data[ 1];
|
||||
var _dims = _data[36];
|
||||
var _padd = _data[37];
|
||||
|
||||
var _amo = _data[ 2];
|
||||
var _pat = _data[ 3];
|
||||
|
||||
|
|
@ -196,124 +212,178 @@ function Node_Repeat(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co
|
|||
var _col = _data[18];
|
||||
var _cls = _data[19];
|
||||
|
||||
var _an_use = _data[29];
|
||||
|
||||
var _an_mid = _data[20];
|
||||
var _an_ran = _data[21];
|
||||
var _an_fal = _data[25];
|
||||
var _an_pos = _data[22];
|
||||
var _an_rot = _data[23];
|
||||
var _an_sca = _data[24];
|
||||
|
||||
var _an_bld = _data[27];
|
||||
var _an_alp = _color_get_alpha(_an_bld);
|
||||
|
||||
var _bld_md = _data[34];
|
||||
|
||||
var _surf, runx, runy, posx, posy, scax, scay, rot;
|
||||
|
||||
var _dim;
|
||||
|
||||
var _surf = _iSrf, _sdim = [ 1, 1 ];
|
||||
|
||||
var minx = 999999, miny = 999999;
|
||||
var maxx = -999999, maxy = -999999;
|
||||
|
||||
if(is_array(_surf)) {
|
||||
for( var i = 0, n = array_length(_surf); i < n; i++ ) {
|
||||
var _ddim = surface_get_dimension(_surf[i]);
|
||||
_sdim[0] = max(_sdim[0], _ddim[0]);
|
||||
_sdim[1] = max(_sdim[1], _ddim[1]);
|
||||
}
|
||||
|
||||
} else if(is_surface(_surf))
|
||||
_sdim = surface_get_dimension(_surf);
|
||||
|
||||
random_set_seed(_sed);
|
||||
|
||||
var atlases = array_create(_amo, 0);
|
||||
var atlas_i = 0;
|
||||
runx = 0;
|
||||
runy = 0;
|
||||
|
||||
for( var i = 0; i < _amo; i++ ) {
|
||||
posx = runx;
|
||||
posy = runy;
|
||||
|
||||
if(_pat == 0) {
|
||||
if(_path == noone || !variable_struct_exists(_path, "getPointRatio")) {
|
||||
posx += _spos[0] + _rpos[0] * i;
|
||||
posy += _spos[1] + _rpos[1] * i;
|
||||
} else {
|
||||
var rat = _prsh + _prng[0] + (_prng[1] - _prng[0]) * i / _amo;
|
||||
if(_prng[1] - _prng[0] == 0) break;
|
||||
rat = abs(frac(rat));
|
||||
|
||||
var _p = _path.getPointRatio(rat);
|
||||
posx = _p.x;
|
||||
posy = _p.y;
|
||||
}
|
||||
} else if(_pat == 1) {
|
||||
var row = floor(i / _col);
|
||||
var col = safe_mod(i, _col);
|
||||
|
||||
posx = _spos[0] + _rpos[0] * col + _cls[0] * row;
|
||||
posy = _spos[1] + _rpos[1] * col + _cls[1] * row;
|
||||
|
||||
} else if(_pat == 2) {
|
||||
var aa = _srot + lerp(_aran[0], _aran[1], i / _amo);
|
||||
posx = _spos[0] + lengthdir_x(_arad, aa);
|
||||
posy = _spos[1] + lengthdir_y(_arad, aa);
|
||||
}
|
||||
|
||||
scax = eval_curve_x(_msca, i / (_amo - 1)) * _rsca;
|
||||
scay = scax;
|
||||
rot = _rots + _rrot[0] + (_rrot[1] - _rrot[0]) * i / _amo;
|
||||
|
||||
var _surf = _iSrf;
|
||||
if(is_array(_iSrf)) {
|
||||
var _sid = 0;
|
||||
|
||||
if(_arr == 0) _sid = safe_mod(i, array_length(_iSrf));
|
||||
else if(_arr == 1) _sid = irandom(array_length(_iSrf) - 1);
|
||||
|
||||
_surf = array_safe_get_fast(_iSrf, _sid);
|
||||
}
|
||||
|
||||
if(!is_surface(_surf)) continue;
|
||||
|
||||
var _sw = surface_get_width_safe(_surf);
|
||||
var _sh = surface_get_height_safe(_surf);
|
||||
var sw = _sw * scax;
|
||||
var sh = _sh * scay;
|
||||
|
||||
if(i) {
|
||||
if(_rsta == 1) {
|
||||
runx += _sw / 2;
|
||||
posx += _sw / 2;
|
||||
}
|
||||
if(_rsta == 2) {
|
||||
runy += _sh / 2;
|
||||
posy += _sh / 2;
|
||||
}
|
||||
}
|
||||
|
||||
var pos = point_rotate(-sw / 2, -sh / 2, 0, 0, rot);
|
||||
var cc = evaluate_gradient_map(i / (_amo - 1), _grad, _grad_map, _grad_range, inputs[14]);
|
||||
var aa = _color_get_alpha(cc);
|
||||
|
||||
////////////////////////////////////////// animator system goes here...
|
||||
|
||||
minx = min(minx, posx + pos[0], posx - pos[0], posx + pos[1], posx - pos[1]);
|
||||
miny = min(miny, posy + pos[0], posy - pos[0], posy + pos[1], posy - pos[1]);
|
||||
maxx = max(maxx, posx + pos[0], posx - pos[0], posx + pos[1], posx - pos[1]);
|
||||
maxy = max(maxy, posy + pos[0], posy - pos[0], posy + pos[1], posy - pos[1]);
|
||||
|
||||
atlases[atlas_i++] = {
|
||||
surface : _surf,
|
||||
x : posx + pos[0],
|
||||
y : posy + pos[1],
|
||||
sx : scax,
|
||||
sy : scay,
|
||||
rot : rot,
|
||||
color : cc,
|
||||
alpha : aa
|
||||
};
|
||||
|
||||
if(_rsta == 1) runx += _sw / 2;
|
||||
if(_rsta == 2) runy += _sh / 2;
|
||||
}
|
||||
|
||||
array_resize(atlases, atlas_i);
|
||||
inputs[ 1].setVisible(false);
|
||||
inputs[36].setVisible(false);
|
||||
inputs[37].setVisible(false);
|
||||
|
||||
switch(_dimt) {
|
||||
case OUTPUT_SCALING.same_as_input :
|
||||
_dim = _sdim;
|
||||
break;
|
||||
|
||||
case OUTPUT_SCALING.constant :
|
||||
inputs[ 1].setVisible(true);
|
||||
|
||||
_dim = _dimc;
|
||||
break;
|
||||
|
||||
case OUTPUT_SCALING.relative :
|
||||
inputs[36].setVisible(true);
|
||||
|
||||
_dim = [ _sdim[0] * _dims[0], _sdim[1] * _dims[1] ];
|
||||
break;
|
||||
|
||||
case OUTPUT_SCALING.scale :
|
||||
inputs[37].setVisible(true);
|
||||
|
||||
_dim = [
|
||||
abs(maxx - minx) + _padd[0] + _padd[2],
|
||||
abs(maxy - miny) + _padd[1] + _padd[3]
|
||||
];
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
_outSurf = surface_verify(_outSurf, _dim[0], _dim[1]);
|
||||
var _x, _y;
|
||||
|
||||
surface_set_shader(_outSurf);
|
||||
if(_bld_md == 0) BLEND_ALPHA_MULP
|
||||
else if(_bld_md == 1) BLEND_ADD
|
||||
else if(_bld_md == 2) { BLEND_ALPHA_MULP gpu_set_blendequation(bm_eq_max); }
|
||||
if(_bld_md == 0) { BLEND_ALPHA_MULP }
|
||||
else if(_bld_md == 1) { BLEND_ADD }
|
||||
else if(_bld_md == 2) { BLEND_MAX }
|
||||
|
||||
runx = 0;
|
||||
runy = 0;
|
||||
|
||||
for( var i = 0; i < _amo; i++ ) {
|
||||
posx = runx;
|
||||
posy = runy;
|
||||
for( var i = 0, n = array_length(atlases); i < n; i++ ) {
|
||||
var _a = atlases[i];
|
||||
|
||||
if(_pat == 0) {
|
||||
if(_path == noone || !variable_struct_exists(_path, "getPointRatio")) {
|
||||
posx += _spos[0] + _rpos[0] * i;
|
||||
posy += _spos[1] + _rpos[1] * i;
|
||||
} else {
|
||||
var rat = _prsh + _prng[0] + (_prng[1] - _prng[0]) * i / _amo;
|
||||
if(_prng[1] - _prng[0] == 0) break;
|
||||
rat = abs(frac(rat));
|
||||
|
||||
var _p = _path.getPointRatio(rat);
|
||||
posx = _p.x;
|
||||
posy = _p.y;
|
||||
}
|
||||
} else if(_pat == 1) {
|
||||
var row = floor(i / _col);
|
||||
var col = safe_mod(i, _col);
|
||||
|
||||
posx = _spos[0] + _rpos[0] * col + _cls[0] * row;
|
||||
posy = _spos[1] + _rpos[1] * col + _cls[1] * row;
|
||||
|
||||
} else if(_pat == 2) {
|
||||
var aa = _srot + lerp(_aran[0], _aran[1], i / _amo);
|
||||
posx = _spos[0] + lengthdir_x(_arad, aa);
|
||||
posy = _spos[1] + lengthdir_y(_arad, aa);
|
||||
shader_set_interpolation(_a.surface);
|
||||
var _x = _a.x;
|
||||
var _y = _a.y;
|
||||
|
||||
if(_dimt == OUTPUT_SCALING.scale) {
|
||||
_x += _padd[2] - minx;
|
||||
_y += _padd[1] - miny;
|
||||
}
|
||||
|
||||
scax = eval_curve_x(_msca, i / (_amo - 1)) * _rsca;
|
||||
scay = scax;
|
||||
rot = _rots + _rrot[0] + (_rrot[1] - _rrot[0]) * i / _amo;
|
||||
|
||||
var _an_dist = abs(i - _an_mid * (_amo - 1));
|
||||
var _inf = 0;
|
||||
if(_an_use && _an_dist < _an_ran * _amo) {
|
||||
_inf = eval_curve_x(_an_fal, _an_dist / (_an_ran * _amo));
|
||||
posx += _an_pos[0] * _inf;
|
||||
posy += _an_pos[1] * _inf;
|
||||
rot += _an_rot * _inf;
|
||||
scax += _an_sca[0] * _inf;
|
||||
scay += _an_sca[1] * _inf;
|
||||
}
|
||||
|
||||
var _surf = _iSrf;
|
||||
|
||||
if(is_array(_iSrf)) {
|
||||
var _sid = 0;
|
||||
|
||||
if(_arr == 0) _sid = safe_mod(i, array_length(_iSrf));
|
||||
else if(_arr == 1) _sid = irandom(array_length(_iSrf) - 1);
|
||||
|
||||
_surf = array_safe_get_fast(_iSrf, _sid);
|
||||
}
|
||||
|
||||
if(!is_surface(_surf)) continue;
|
||||
|
||||
var _sw = surface_get_width_safe(_surf);
|
||||
var _sh = surface_get_height_safe(_surf);
|
||||
var sw = _sw * scax;
|
||||
var sh = _sh * scay;
|
||||
|
||||
if(i) {
|
||||
if(_rsta == 1) {
|
||||
runx += _sw / 2;
|
||||
posx += _sw / 2;
|
||||
}
|
||||
if(_rsta == 2) {
|
||||
runy += _sh / 2;
|
||||
posy += _sh / 2;
|
||||
}
|
||||
}
|
||||
|
||||
var pos = point_rotate(-sw / 2, -sh / 2, 0, 0, rot);
|
||||
var cc = evaluate_gradient_map(i / (_amo - 1), _grad, _grad_map, _grad_range, inputs[14]);
|
||||
var aa = _color_get_alpha(cc);
|
||||
|
||||
if(_an_use) {
|
||||
cc = merge_color_a(cc, colorMultiply(cc, _an_bld), _inf);
|
||||
aa += _an_alp * _inf;
|
||||
}
|
||||
|
||||
shader_set_interpolation(_surf);
|
||||
draw_surface_ext_safe(_surf, posx + pos[0], posy + pos[1], scax, scay, rot, cc, aa);
|
||||
|
||||
if(_rsta == 1) runx += _sw / 2;
|
||||
if(_rsta == 2) runy += _sh / 2;
|
||||
draw_surface_ext_safe(_a.surface, _x, _y, _a.sx, _a.sy, _a.rot, _a.color, _a.alpha);
|
||||
}
|
||||
|
||||
BLEND_NORMAL
|
||||
gpu_set_blendequation(bm_eq_add);
|
||||
surface_reset_shader();
|
||||
|
||||
return _outSurf;
|
||||
|
|
|
|||
|
|
@ -46,7 +46,12 @@ function Node_Transform(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
|
|||
newInput(8, nodeValue_Float("Rotate by velocity", self, 0, "Make the surface rotates to follow its movement."))
|
||||
.setDisplay(VALUE_DISPLAY.slider);
|
||||
|
||||
newInput(9, nodeValue_Enum_Scroll("Output dimension type", self, OUTPUT_SCALING.same_as_input, [ "Same as input", "Constant", "Relative to input", "Transformed" ]));
|
||||
newInput(9, nodeValue_Enum_Scroll("Output dimension type", self, OUTPUT_SCALING.same_as_input, [
|
||||
new scrollItem("Same as input"),
|
||||
new scrollItem("Constant"),
|
||||
new scrollItem("Relative to input").setTooltip("Set dimension as a multiple of input surface."),
|
||||
new scrollItem("Fit content").setTooltip("Automatically set dimension to fit content."),
|
||||
]));
|
||||
|
||||
newInput(10, nodeValue_Bool("Round position", self, false, "Round position to the nearest integer value to avoid jittering."));
|
||||
|
||||
|
|
@ -216,20 +221,23 @@ function Node_Transform(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
|
|||
|
||||
if(_ww <= 1 && _hh <= 1) return _outRes;
|
||||
|
||||
switch(out_type) { #region output dimension
|
||||
switch(out_type) { // output dimension
|
||||
case OUTPUT_SCALING.same_as_input :
|
||||
inputs[1].setVisible(false);
|
||||
break;
|
||||
|
||||
case OUTPUT_SCALING.constant :
|
||||
inputs[1].setVisible(true);
|
||||
_ww = out[0];
|
||||
_hh = out[1];
|
||||
break;
|
||||
|
||||
case OUTPUT_SCALING.relative :
|
||||
inputs[1].setVisible(true);
|
||||
_ww = ww * out[0];
|
||||
_hh = hh * out[1];
|
||||
break;
|
||||
|
||||
case OUTPUT_SCALING.scale :
|
||||
inputs[1].setVisible(false);
|
||||
_ww = ww * sca[0];
|
||||
|
|
@ -248,7 +256,7 @@ function Node_Transform(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
|
|||
_ww = maxx - minx;
|
||||
_hh = maxy - miny;
|
||||
break;
|
||||
} #endregion
|
||||
}
|
||||
|
||||
_outRes[1] = [ ww, hh ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ function scrollItem(name, spr = noone, spr_ind = 0, spr_blend = COLORS._main_ico
|
|||
self.spr_blend = spr_blend;
|
||||
|
||||
tooltip = "";
|
||||
|
||||
static setTooltip = function(_tt) { tooltip = _tt; return self; }
|
||||
}
|
||||
|
||||
function scrollBox(_data, _onModify, update_hover = true) : widget() constructor {
|
||||
|
|
|
|||
Loading…
Reference in a new issue