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

0.8.2 release

Browse source
This commit is contained in:
MakhamDev 2022-01-17 18:10:30 +07:00
parent 904b7ccc2f
commit 4c828c06ed
8 changed files with 41 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
datafiles/Collections.zip
View file

Binary file not shown.

2
options/windows/options_windows.yy
View file

@ -1,6 +1,6 @@
{
"option_windows_display_name": "Pixel Composer 0.8.2",
"option_windows_executable_name": "${project_name}.exe",
"option_windows_executable_name": "${project_name} 0.8.2.exe",
"option_windows_version": "0.8.2.0",
"option_windows_company_info": "MakhamDev",
"option_windows_product_info": "Pixel Composer",

24
scripts/node_color_adjustment/node_color_adjustment.gml
View file

@ -23,29 +23,37 @@ function Node_Color_adjust(_x, _y) : Node_Processor(_x, _y) constructor {
inputs[| 0] = nodeValue(0, "Surface in", self, JUNCTION_CONNECT.input, VALUE_TYPE.surface, 0);
inputs[| 1] = nodeValue(1, "Brightness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0)
.setDisplay(VALUE_DISPLAY.slider, [ -1, 1, 0.01]);
.setDisplay(VALUE_DISPLAY.slider, [ -1, 1, 0.01])
.setVisible(false);
inputs[| 2] = nodeValue(2, "Contrast", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0)
.setDisplay(VALUE_DISPLAY.slider, [ -1, 1, 0.01]);
.setDisplay(VALUE_DISPLAY.slider, [ -1, 1, 0.01])
.setVisible(false);
inputs[| 3] = nodeValue(3, "Hue", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0)
.setDisplay(VALUE_DISPLAY.slider, [ -1, 1, 0.01]);
.setDisplay(VALUE_DISPLAY.slider, [ -1, 1, 0.01])
.setVisible(false);
inputs[| 4] = nodeValue(4, "Saturation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0)
.setDisplay(VALUE_DISPLAY.slider, [ -1, 1, 0.01]);
.setDisplay(VALUE_DISPLAY.slider, [ -1, 1, 0.01])
.setVisible(false);
inputs[| 5] = nodeValue(5, "Value", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0)
.setDisplay(VALUE_DISPLAY.slider, [ -1, 1, 0.01]);
.setDisplay(VALUE_DISPLAY.slider, [ -1, 1, 0.01])
.setVisible(false);
inputs[| 6] = nodeValue(6, "Blend", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white);
inputs[| 6] = nodeValue(6, "Blend", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white)
.setVisible(false);
inputs[| 7] = nodeValue(7, "Blend alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0)
.setDisplay(VALUE_DISPLAY.slider, [ 0, 1, 0.01]);
.setDisplay(VALUE_DISPLAY.slider, [ 0, 1, 0.01])
.setVisible(false);
inputs[| 8] = nodeValue(8, "Mask", self, JUNCTION_CONNECT.input, VALUE_TYPE.surface, 0);
inputs[| 9] = nodeValue(9, "Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1)
.setDisplay(VALUE_DISPLAY.slider, [ 0, 1, 0.01]);
.setDisplay(VALUE_DISPLAY.slider, [ 0, 1, 0.01])
.setVisible(false);
outputs[| 0] = nodeValue(0, "Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, surface_create(1, 1));

8
scripts/node_data/node_data.gml
View file

@ -43,8 +43,6 @@ function Node(_x, _y) constructor {
preview_x = 0;
preview_y = 0;
output_preview_index = 0;
rendered = false;
auto_update = true;
update_on_frame = false;
@ -268,10 +266,6 @@ function Node(_x, _y) constructor {
hover = jun;
show_output_name = true;
draw_sprite_ext(jun.isArray()? s_node_junctions_array_hover : s_node_junctions_hover, jun.type, jx, jy, ss, ss, 0, c_white, 1);
if(jun.type == VALUE_TYPE.surface) {
output_preview_index = i;
}
} else {
_draw_cc = c_ui_blue_grey;
draw_sprite_ext(jun.isArray()? s_node_junctions_array : s_node_junctions, jun.type, jx, jy, ss, ss, 0, c_white, 1);
@ -370,7 +364,7 @@ function Node(_x, _y) constructor {
var yy = y * _s + _y;
drawNodeBase(xx, yy, _s);
if(previewable && ds_list_size(outputs) > 0)
drawPreview(outputs[| output_preview_index], xx, yy, _s);
drawPreview(outputs[| preview_channel], xx, yy, _s);
drawNodeName(xx, yy, _s);
onDrawNode(xx, yy, _mx, _my, _s);

9
scripts/node_group_input/node_group_input.gml
View file

@ -49,6 +49,15 @@ function Node_Group_Input(_x, _y, _group) : Node(_x, _y) constructor {
var _enum_label = inputs[| 3].getValue();
var _vec_size = inputs[| 4].getValue();
if(index == 2) {
var _o = outputs[| 0];
for(var j = 0; j < ds_list_size(_o.value_to); j++) {
var _to = _o.value_to[| j];
if(_to.value_from == _o)
_to.removeFrom();
}
}
_inParent.type = _val_type;
outputs[| 0].type = _val_type;
var _val = _inParent.getValue();

4
scripts/node_scale/node_scale.gml
View file

@ -10,7 +10,9 @@ function Node_Scale(_x, _y) : Node_Processor(_x, _y) constructor {
inputs[| 0] = nodeValue(0, "Surface in", self, JUNCTION_CONNECT.input, VALUE_TYPE.surface, 0);
inputs[| 1] = nodeValue(1, "Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1);
inputs[| 2] = nodeValue(2, "Keep dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false);
inputs[| 2] = nodeValue(2, "Keep dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false)
.setVisible(false);
outputs[| 0] = nodeValue(0, "Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, surface_create(1, 1));

9
scripts/panel_animation/panel_animation.gml
View file

@ -126,8 +126,13 @@ function Panel_Animation(_panel) : PanelContent(_panel) constructor {
function updatePropertyList() {
ds_list_clear(anim_properties);
for( var i = 0; i < ds_list_size(PANEL_GRAPH.nodes_list); i++ ) {
var _node = PANEL_GRAPH.nodes_list[| i];
var amo = ds_map_size(NODE_MAP);
var k = ds_map_find_first(NODE_MAP);
repeat(amo) {
var _node = NODE_MAP[? k];
k = ds_map_find_next(NODE_MAP, k);
if(!_node.active) continue;
for(var j = 0; j < ds_list_size(_node.inputs); j++) {

8
shaders/sh_color_adjust/sh_color_adjust.fsh
View file

@ -63,9 +63,9 @@ void main() {
vec4 mas = texture2D( mask, v_vTexcoord );
mas.rgb *= mas.a;
gl_FragColor = col_cbh * mas + col * (vec4(1.) - mas);
} else
gl_FragColor.a = col.a * mix(1., v_vColour.a, mas.r);
} else {
gl_FragColor = col_cbh;
//alpha
gl_FragColor.a = col.a * v_vColour.a;
gl_FragColor.a = col.a * v_vColour.a;
}
}