mirror of
https://github.com/Ttanasart-pt/Pixel-Composer.git
synced 2024-12-25 14:36:13 +01:00
10.1 patch
This commit is contained in:
parent
60881f3c71
commit
dd0180e186
4 changed files with 39 additions and 28 deletions
|
@ -153,7 +153,7 @@ event_inherited();
|
||||||
draw_sprite_ui(spr, ind, ui(16), _ty, .75, .75, 0, COLORS._main_icon, 0.75);
|
draw_sprite_ui(spr, ind, ui(16), _ty, .75, .75, 0, COLORS._main_icon, 0.75);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(_key != noone) {
|
if(is_instanceof(_key, hotkeyObject)) {
|
||||||
var _hx = _dw - ui(6);
|
var _hx = _dw - ui(6);
|
||||||
var _hy = _ty + ui(1);
|
var _hy = _ty + ui(1);
|
||||||
|
|
||||||
|
|
|
@ -56,21 +56,31 @@ if(!ready) exit;
|
||||||
|
|
||||||
if(_hovering_ch && is_instanceof(_menuItem, MenuItem)) {
|
if(_hovering_ch && is_instanceof(_menuItem, MenuItem)) {
|
||||||
if(_menuItem.active && _lclick) {
|
if(_menuItem.active && _lclick) {
|
||||||
var _dat = {
|
|
||||||
_x: dialog_x,
|
|
||||||
x: dialog_x + dialog_w,
|
|
||||||
y: yy,
|
|
||||||
depth: depth,
|
|
||||||
name: _menuItem.name,
|
|
||||||
index: i,
|
|
||||||
context: context,
|
|
||||||
params: _menuItem.params,
|
|
||||||
};
|
|
||||||
|
|
||||||
var _res = _menuItem.func(_dat);
|
if(_menuItem.isShelf) {
|
||||||
if(_menuItem.isShelf) array_push(children, _res.id); // open child
|
var _dat = {
|
||||||
else if(remove_parents) instance_destroy(o_dialog_menubox); // close all
|
_x: dialog_x,
|
||||||
else instance_destroy(); // close self
|
x: dialog_x + dialog_w,
|
||||||
|
y: yy,
|
||||||
|
depth: depth,
|
||||||
|
name: _menuItem.name,
|
||||||
|
index: i,
|
||||||
|
context: context,
|
||||||
|
params: _menuItem.params,
|
||||||
|
};
|
||||||
|
|
||||||
|
var _res = _menuItem.func(_dat);
|
||||||
|
array_push(children, _res.id); // open child
|
||||||
|
|
||||||
|
} else if(remove_parents) {
|
||||||
|
_menuItem.func();
|
||||||
|
instance_destroy(o_dialog_menubox); // close all
|
||||||
|
|
||||||
|
} else {
|
||||||
|
_menuItem.func();
|
||||||
|
instance_destroy(); // close self
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -36,11 +36,11 @@
|
||||||
globalvar VERSION, SAVE_VERSION, VERSION_STRING, BUILD_NUMBER, LATEST_VERSION;
|
globalvar VERSION, SAVE_VERSION, VERSION_STRING, BUILD_NUMBER, LATEST_VERSION;
|
||||||
globalvar HOTKEYS, HOTKEY_CONTEXT;
|
globalvar HOTKEYS, HOTKEY_CONTEXT;
|
||||||
|
|
||||||
LATEST_VERSION = 1_17_00_0;
|
LATEST_VERSION = 1_16_00_0;
|
||||||
VERSION = 1_17_10_0;
|
VERSION = 1_17_10_1;
|
||||||
SAVE_VERSION = 1_17_10_0;
|
SAVE_VERSION = 1_17_10_0;
|
||||||
VERSION_STRING = "1.17.10";
|
VERSION_STRING = "1.17.10.001";
|
||||||
BUILD_NUMBER = 1_17_10_0;
|
BUILD_NUMBER = 1_17_10_1;
|
||||||
|
|
||||||
HOTKEYS = ds_map_create();
|
HOTKEYS = ds_map_create();
|
||||||
HOTKEY_CONTEXT = ds_list_create();
|
HOTKEY_CONTEXT = ds_list_create();
|
||||||
|
|
|
@ -41,7 +41,7 @@ output.color = surfaceColor;")
|
||||||
inputs[index + 1] = nodeValue_Enum_Scroll("Argument type", self, 0 , { data: [ "Float", "Int", "Vec2", "Vec3", "Vec4", "Mat3", "Mat4", "Sampler2D", "Color" ], update_hover: false });
|
inputs[index + 1] = nodeValue_Enum_Scroll("Argument type", self, 0 , { data: [ "Float", "Int", "Vec2", "Vec3", "Vec4", "Mat3", "Mat4", "Sampler2D", "Color" ], update_hover: false });
|
||||||
inputs[index + 1].editWidget.interactable = false;
|
inputs[index + 1].editWidget.interactable = false;
|
||||||
|
|
||||||
inputs[index + 2] = nodeValue_Float("Argument value", self, 0 )
|
inputs[index + 2] = nodeValue("Argument value", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 )
|
||||||
.setVisible(true, true);
|
.setVisible(true, true);
|
||||||
inputs[index + 2].editWidget.interactable = false;
|
inputs[index + 2].editWidget.interactable = false;
|
||||||
}
|
}
|
||||||
|
@ -94,7 +94,7 @@ void main(in VertexShaderOutput _input, out PixelShaderOutput output) {
|
||||||
|
|
||||||
input_display_list = [ 2,
|
input_display_list = [ 2,
|
||||||
["Vertex Shader [read only]", true], new Inspector_Label(vs_string, _f_code_s),
|
["Vertex Shader [read only]", true], new Inspector_Label(vs_string, _f_code_s),
|
||||||
["Shader", false], preLabel, 1, new Inspector_Label(fs_postString, _f_code_s),
|
["Fragmanet Shader", false], preLabel, 1, new Inspector_Label(fs_postString, _f_code_s),
|
||||||
["Arguments", false], argument_renderer,
|
["Arguments", false], argument_renderer,
|
||||||
["Values", true],
|
["Values", true],
|
||||||
];
|
];
|
||||||
|
@ -110,18 +110,18 @@ void main(in VertexShaderOutput _input, out PixelShaderOutput output) {
|
||||||
array_resize(input_display_list, input_display_len);
|
array_resize(input_display_list, input_display_len);
|
||||||
|
|
||||||
for( var i = input_fix_len; i < array_length(inputs); i += data_length ) {
|
for( var i = input_fix_len; i < array_length(inputs); i += data_length ) {
|
||||||
if(getInputData(i) == "") {
|
var inp_name = inputs[i].getValue();
|
||||||
|
var inp_type = inputs[i + 1];
|
||||||
|
var inp_valu = inputs[i + 2];
|
||||||
|
var cur_valu = inputs[i + 2].getValue();
|
||||||
|
|
||||||
|
if(inp_name == "") {
|
||||||
delete inputs[i + 0];
|
delete inputs[i + 0];
|
||||||
delete inputs[i + 1];
|
delete inputs[i + 1];
|
||||||
delete inputs[i + 2];
|
delete inputs[i + 2];
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
var inp_name = getInputData(i + 0);
|
|
||||||
var inp_type = inputs[i + 1];
|
|
||||||
var inp_valu = inputs[i + 2];
|
|
||||||
var cur_valu = getInputData(i + 2);
|
|
||||||
|
|
||||||
array_push(_in, inputs[i + 0]);
|
array_push(_in, inputs[i + 0]);
|
||||||
array_push(_in, inp_type);
|
array_push(_in, inp_type);
|
||||||
array_push(_in, inp_valu);
|
array_push(_in, inp_valu);
|
||||||
|
@ -210,7 +210,7 @@ void main(in VertexShaderOutput _input, out PixelShaderOutput output) {
|
||||||
}
|
}
|
||||||
|
|
||||||
for( var i = 0; i < array_length(_in); i++ )
|
for( var i = 0; i < array_length(_in); i++ )
|
||||||
_in[ i].index = i;
|
_in[i].index = i;
|
||||||
|
|
||||||
inputs = _in;
|
inputs = _in;
|
||||||
createNewInput();
|
createNewInput();
|
||||||
|
@ -219,6 +219,7 @@ void main(in VertexShaderOutput _input, out PixelShaderOutput output) {
|
||||||
//for( var i = 0, n = array_length(input_display_list); i < n; i++ )
|
//for( var i = 0, n = array_length(input_display_list); i < n; i++ )
|
||||||
// print(input_display_list[i]);
|
// print(input_display_list[i]);
|
||||||
//print("==========================");
|
//print("==========================");
|
||||||
|
|
||||||
} if(!LOADING && !APPENDING) refreshDynamicInput();
|
} if(!LOADING && !APPENDING) refreshDynamicInput();
|
||||||
|
|
||||||
insp1UpdateTooltip = __txt("Compile");
|
insp1UpdateTooltip = __txt("Compile");
|
||||||
|
|
Loading…
Reference in a new issue