mirrors/Pixel-Composer
1
0
Fork 0
mirror of https://github.com/Ttanasart-pt/Pixel-Composer.git synced 2024-12-24 22:16:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

- [Preview Panel] Hovering on gradient map anchor now show mapped surface.

Browse source
This commit is contained in:
Tanasart 2024-06-23 14:36:51 +07:00
parent ee6d753836
commit c3f1ffa58e
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
scripts/node_value/node_value.gml
View file

@ -369,15 +369,12 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru
mapButton = button(function() { mapButton = button(function() {
attributes.mapped = !attributes.mapped; attributes.mapped = !attributes.mapped;
var val = getValue();
if( attributes.mapped) if(type == VALUE_TYPE.integer || type == VALUE_TYPE.float) {
setValue(mapped_vec4? [ 0, 0, 0, 0 ] : [ 0, 0 ]); if(attributes.mapped) setValue(mapped_vec4? [ 0, 0, 0, 0 ] : [ 0, 0 ]);
else setValue(def_val);
if(!attributes.mapped) setArrayDepth(attributes.mapped);
setValue(def_val); }
setArrayDepth(attributes.mapped);
node.triggerRender(); node.triggerRender();
}) })

14
scripts/preview_overlay_gradient_range/preview_overlay_gradient_range.gml
View file

@ -1,6 +1,9 @@
function preview_overlay_gradient_range(interact, active, _x, _y, _s, _mx, _my, _snx, _sny, _dim) { function preview_overlay_gradient_range(interact, active, _x, _y, _s, _mx, _my, _snx, _sny, _dim) {
var _val = array_clone(getValue()); var _val = array_clone(getValue());
var hover = -1; var _targI = node.inputs[| mappedJunc.attributes.map_index];
var _surf = _targI.getValue();
var hover = -1;
if(!is_array(_val) || array_empty(_val)) return hover; if(!is_array(_val) || array_empty(_val)) return hover;
if(is_array(_val[0])) return hover; if(is_array(_val[0])) return hover;
@ -20,6 +23,10 @@ function preview_overlay_gradient_range(interact, active, _x, _y, _s, _mx, _my,
var cc = COLORS.labels[2]; var cc = COLORS.labels[2];
var _r = 10; var _r = 10;
__overlay_hover = array_verify(__overlay_hover, 2);
if(surface_exists(_surf) && (__overlay_hover[0] > 0 || __overlay_hover[1] > 0))
draw_surface_stretched_ext(_surf, _x, _y, _sw * _s, _sh * _s, c_white, 0.25);
draw_set_text(f_p1, fa_left, fa_bottom, cc); draw_set_text(f_p1, fa_left, fa_bottom, cc);
draw_text_add(_ax0 + ui(4), _ay0 - ui(4), "1"); draw_text_add(_ax0 + ui(4), _ay0 - ui(4), "1");
draw_text_add(_ax1 + ui(4), _ay1 - ui(4), "2"); draw_text_add(_ax1 + ui(4), _ay1 - ui(4), "2");
@ -99,12 +106,11 @@ function preview_overlay_gradient_range(interact, active, _x, _y, _s, _mx, _my,
} }
} }
__overlay_hover = array_verify(__overlay_hover, 2);
__overlay_hover[0] = lerp_float(__overlay_hover[0], d0, 4); __overlay_hover[0] = lerp_float(__overlay_hover[0], d0, 4);
__overlay_hover[1] = lerp_float(__overlay_hover[1], d1, 4); __overlay_hover[1] = lerp_float(__overlay_hover[1], d1, 4);
draw_anchor(__overlay_hover[0], _ax0, _ay0, _r); draw_anchor(__overlay_hover[0], _ax0, _ay0, _r);
draw_anchor(__overlay_hover[0], _ax1, _ay1, _r); draw_anchor(__overlay_hover[1], _ax1, _ay1, _r);
return hover; return hover;
} }