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

Computer migration. Bug fixes.

Browse source
This commit is contained in:
MakhamDev 2023-10-01 11:17:39 +07:00
parent 6173fda1a1
commit 480e38ae01
17 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PixelComposer.yyp
View file

@ -744,7 +744,7 @@
"isEcma": false, "isEcma": false,
"LibraryEmitters": [], "LibraryEmitters": [],
"MetaData": { "MetaData": {
"IDEVersion": "2023.8.0.98", "IDEVersion": "2023.8.1.102",
}, },
"resources": [ "resources": [
{"id":{"name":"s_node_corner","path":"sprites/s_node_corner/s_node_corner.yy",},}, {"id":{"name":"s_node_corner","path":"sprites/s_node_corner/s_node_corner.yy",},},

3
objects/o_dialog_file_name_collection/Draw_64.gml
View file

@ -30,9 +30,8 @@
var txt = __txtx("new_collection_create", "Create collection"); var txt = __txtx("new_collection_create", "Create collection");
var icon = THEME.accept; var icon = THEME.accept;
var clr = COLORS._main_value_positive; var clr = COLORS._main_value_positive;
if(updating != noone) { if(updating != noone)
txt = __txtx("new_collection_update", "Update collection"); txt = __txtx("new_collection_update", "Update collection");
}
if(ugc == 1) { if(ugc == 1) {
txt = __txtx("panel_inspector_workshop_upload", "Upload to Steam Workshop"); txt = __txtx("panel_inspector_workshop_upload", "Upload to Steam Workshop");

2
scripts/BBMOD_DualQuaternion/BBMOD_DualQuaternion.gml
View file

@ -1,3 +1,5 @@
// feather ignore all
/// @func BBMOD_DualQuaternion([_x, _y, _z, _w, _dx, _dy, _dz, _dw]) /// @func BBMOD_DualQuaternion([_x, _y, _z, _w, _dx, _dy, _dz, _dw])
/// ///
/// @desc A dual quaternion. /// @desc A dual quaternion.

7
scripts/BBMOD_Quaternion/BBMOD_Quaternion.gml
View file

@ -1,3 +1,5 @@
// feather ignore all
/// @func BBMOD_Quaternion([_x, _y, _z, _w]) /// @func BBMOD_Quaternion([_x, _y, _z, _w])
/// ///
/// @desc A quaternion. /// @desc A quaternion.
@ -410,10 +412,11 @@ function BBMOD_Quaternion(_x=0.0, _y=0.0, _z=0.0, _w=1.0) constructor
static Normalize = function () { static Normalize = function () {
gml_pragma("forceinline"); gml_pragma("forceinline");
var _lengthSqr = LengthSqr(); var _lengthSqr = LengthSqr();
if(_lengthSqr == 0)
return new BBMOD_Quaternion();
if (_lengthSqr >= math_get_epsilon()) if (_lengthSqr >= math_get_epsilon())
{
return Scale(1.0 / sqrt(_lengthSqr)); return Scale(1.0 / sqrt(_lengthSqr));
}
return Clone(); return Clone();
}; };

2
scripts/addon_lua/addon_lua.gml
View file

@ -1007,7 +1007,7 @@ end",
with(_addon_custom) if(self.ID == ID) _addon = self; with(_addon_custom) if(self.ID == ID) _addon = self;
if(_addon == noone) return noone; if(_addon == noone) return noone;
var wd = new button(onModify).setText(txt); var wd = button(onModify).setText(txt);
wd.setLua(_addon.thread, onModify, function() { wd.setLua(_addon.thread, onModify, function() {
return lua_call(lua_thread, lua_thread_key); return lua_call(lua_thread, lua_thread_key);
}); });

4
scripts/buttonPalette/buttonPalette.gml
View file

@ -1,7 +1,7 @@
function buttonPalette(_onApply, dialog = noone) : widget() constructor { function buttonPalette(_onApply, dialog = noone) : widget() constructor {
onApply = _onApply; onApply = _onApply;
parentDialog = dialog; parentDialog = dialog;
current_palette = noone; current_palette = [];
function apply(value) { function apply(value) {
if(!interactable) return; if(!interactable) return;
@ -42,7 +42,7 @@ function buttonPalette(_onApply, dialog = noone) : widget() constructor {
h = _h; h = _h;
} }
if(!is_array(current_palette) || is_array(current_palette[0])) if(!is_array(current_palette) || array_empty(current_palette) || is_array(current_palette[0]))
return 0; return 0;
var hoverRect = point_in_rectangle(_m[0], _m[1], _x, _y, _x + _w, _y + h); var hoverRect = point_in_rectangle(_m[0], _m[1], _x, _y, _x + _w, _y + h);

3
scripts/collection_data/collection_data.gml
View file

@ -29,9 +29,6 @@ function refreshCollections() {
} }
function searchCollection(_list, _search_str, _clear_list = true) { function searchCollection(_list, _search_str, _clear_list = true) {
//if(_clear_list)
// ds_list_clear(_list);
if(_search_str == "") return; if(_search_str == "") return;
var search_lower = string_lower(_search_str); var search_lower = string_lower(_search_str);

2
scripts/gif_reader/gif_reader.gml
View file

@ -1055,7 +1055,7 @@ function gif_std_enum_getIndex() {
static readUInt16 = method(undefined, haxe_io_Input_readUInt16); static readUInt16 = method(undefined, haxe_io_Input_readUInt16);
static readBytes = method(undefined, haxe_io_Input_readBytes); static readBytes = method(undefined, haxe_io_Input_readBytes);
static readString = method(undefined, haxe_io_Input_readString); static readString = method(undefined, haxe_io_Input_readString);
if (_sourcePos == undefined) _sourcePos = 0; _sourcePos ??= 0;
if (false) throw argument[2]; if (false) throw argument[2];
method(self, haxe_io_Input_new)(); method(self, haxe_io_Input_new)();
if (_sourceLen == undefined) _sourceLen = array_length(_sourceBytes.b) - _sourcePos; if (_sourceLen == undefined) _sourceLen = array_length(_sourceBytes.b) - _sourcePos;

6
scripts/globals/globals.gml
View file

@ -105,10 +105,10 @@
globalvar VERSION, SAVE_VERSION, VERSION_STRING, BUILD_NUMBER; globalvar VERSION, SAVE_VERSION, VERSION_STRING, BUILD_NUMBER;
VERSION = 11530; VERSION = 11531;
SAVE_VERSION = 11530; SAVE_VERSION = 11530;
VERSION_STRING = "1.15.3.0"; VERSION_STRING = "1.15.3.1";
BUILD_NUMBER = 11530; BUILD_NUMBER = 11531;
globalvar APPEND_MAP; globalvar APPEND_MAP;
APPEND_MAP = ds_map_create(); APPEND_MAP = ds_map_create();

1
scripts/node_VFX_spawner/node_VFX_spawner.gml
View file

@ -106,5 +106,4 @@ function Node_VFX_Spawner(_x, _y, _group = noone) : Node_VFX_Spawner_Base(_x, _y
draw_surface_align(spr, cx, cy, ss, fa_center, fa_center); draw_surface_align(spr, cx, cy, ss, fa_center, fa_center);
} #endregion } #endregion
} }

7
scripts/node_data/node_data.gml
View file

@ -49,6 +49,8 @@ function Node(_x, _y, _group = PANEL_GRAPH.getCurrentContext()) : __Node_Base(_x
name = ""; name = "";
display_name = ""; display_name = "";
internalName = ""; internalName = "";
onSetDisplayName = noone;
renamed = false;
tooltip = ""; tooltip = "";
x = _x; x = _x;
@ -251,8 +253,8 @@ function Node(_x, _y, _group = PANEL_GRAPH.getCurrentContext()) : __Node_Base(_x
h = max(min_h, (preview_surface && previewable)? 128 : 0, _hi, _ho); h = max(min_h, (preview_surface && previewable)? 128 : 0, _hi, _ho);
} #endregion } #endregion
onSetDisplayName = noone;
static setDisplayName = function(_name) { #region static setDisplayName = function(_name) { #region
renamed = true;
display_name = _name; display_name = _name;
internalName = string_replace_all(display_name, " ", "_"); internalName = string_replace_all(display_name, " ", "_");
refreshNodeMap(); refreshNodeMap();
@ -1376,6 +1378,7 @@ function Node(_x, _y, _group = PANEL_GRAPH.getCurrentContext()) : __Node_Base(_x
array_push(_trigger, inspectInput2.serialize(scale, preset)); array_push(_trigger, inspectInput2.serialize(scale, preset));
array_push(_trigger, updatedTrigger.serialize(scale, preset)); array_push(_trigger, updatedTrigger.serialize(scale, preset));
_map.inspectInputs = _trigger; _map.inspectInputs = _trigger;
_map.renamed = renamed;
doSerialize(_map); doSerialize(_map);
processSerialize(_map); processSerialize(_map);
@ -1432,6 +1435,8 @@ function Node(_x, _y, _group = PANEL_GRAPH.getCurrentContext()) : __Node_Base(_x
triggerRender(); triggerRender();
} }
renamed = struct_try_get(load_map, "renamed", false);
} #endregion } #endregion
static inputBalance = function() { #region //Cross version compatibility for dynamic input nodes static inputBalance = function() { #region //Cross version compatibility for dynamic input nodes

1
scripts/node_image_gif/node_image_gif.gml
View file

@ -109,7 +109,6 @@ function Node_Image_gif(_x, _y, _group = noone) : Node(_x, _y, _group) construct
spr = spr_builder._spr; spr = spr_builder._spr;
triggerRender(); triggerRender();
loading = 0; loading = 0;
delete spr_builder;
gc_collect(); gc_collect();
} }

4
scripts/node_pin/node_pin.gml
View file

@ -65,7 +65,7 @@ function Node_Pin(_x, _y, _group = noone) : Node(_x, _y, _group) constructor {
if(hov != noone) jun = hov.connect_type == JUNCTION_CONNECT.input? outputs[| 0] : inputs[| 0]; if(hov != noone) jun = hov.connect_type == JUNCTION_CONNECT.input? outputs[| 0] : inputs[| 0];
else jun = inputs[| 0].value_from == noone? inputs[| 0] : outputs[| 0]; else jun = inputs[| 0].value_from == noone? inputs[| 0] : outputs[| 0];
if(jun.drawJunction(_s, _mx, _my,)) if(jun.drawJunction(_s, _mx, _my))
hover = jun; hover = jun;
} }
@ -85,7 +85,7 @@ function Node_Pin(_x, _y, _group = noone) : Node(_x, _y, _group) constructor {
active_draw_index = -1; active_draw_index = -1;
} }
if(display_name != "") { if(renamed && display_name != "" && display_name != "Pin") {
draw_set_text(f_p0, fa_center, fa_bottom, COLORS._main_text); draw_set_text(f_p0, fa_center, fa_bottom, COLORS._main_text);
draw_text_transformed(xx, yy - 12, display_name, _s, _s, 0); draw_text_transformed(xx, yy - 12, display_name, _s, _s, 0);
} }

4
scripts/node_rigid_object/node_rigid_object.gml
View file

@ -2,7 +2,6 @@ function Node_Rigid_Object(_x, _y, _group = noone) : Node(_x, _y, _group) constr
name = "Object"; name = "Object";
color = COLORS.node_blend_simulation; color = COLORS.node_blend_simulation;
icon = THEME.rigidSim; icon = THEME.rigidSim;
//update_on_frame = true;
w = 96; w = 96;
min_h = 96; min_h = 96;
@ -29,8 +28,7 @@ function Node_Rigid_Object(_x, _y, _group = noone) : Node(_x, _y, _group) constr
.setDisplay(VALUE_DISPLAY.enum_scroll, [ "Box", "Circle", "Custom" ]) .setDisplay(VALUE_DISPLAY.enum_scroll, [ "Box", "Circle", "Custom" ])
.rejectArray(); .rejectArray();
inputs[| 6] = nodeValue("Texture", self, JUNCTION_CONNECT.input, VALUE_TYPE.surface, noone) inputs[| 6] = nodeValue("Texture", self, JUNCTION_CONNECT.input, VALUE_TYPE.surface, noone);
.rejectArray();
inputs[| 7] = nodeValue("Start shape", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 16, 16, 4, 4, AREA_SHAPE.rectangle ]) inputs[| 7] = nodeValue("Start shape", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 16, 16, 4, 4, AREA_SHAPE.rectangle ])
.setDisplay(VALUE_DISPLAY.area); .setDisplay(VALUE_DISPLAY.area);

4
scripts/panel_animation/panel_animation.gml
View file

@ -1884,9 +1884,11 @@ function Panel_Animation() : PanelContent() constructor {
for( var i = 0, n = array_length(keyframe_selecting); i < n; i++ ) { for( var i = 0, n = array_length(keyframe_selecting); i < n; i++ ) {
var cl = keyframe_selecting[i].cloneAnimator(,, false); var cl = keyframe_selecting[i].cloneAnimator(,, false);
if(cl == noone) continue; if(cl == noone) continue;
array_append(clones, cl); array_push(clones, cl);
} }
if(array_empty(clones)) return;
keyframe_selecting = clones; keyframe_selecting = clones;
keyframe_dragging = keyframe_selecting[0]; keyframe_dragging = keyframe_selecting[0];
keyframe_drag_type = KEYFRAME_DRAG_TYPE.move; keyframe_drag_type = KEYFRAME_DRAG_TYPE.move;

2
scripts/panel_collection/panel_collection.gml
View file

@ -219,7 +219,7 @@ function Panel_Collection() : PanelContent() constructor {
draw_sprite_ui_uniform(THEME.group, 0, _boxx + grid_size / 2, yy + grid_size / 2, 1, c_white); draw_sprite_ui_uniform(THEME.group, 0, _boxx + grid_size / 2, yy + grid_size / 2, 1, c_white);
if(meta != noone && mode == 0) { if(meta != noone && mode == 0) {
if(meta.steam) { if(struct_try_get(meta, "steam")) {
draw_sprite_ui_uniform(THEME.steam, 0, _boxx + ui(12), yy + ui(12), 1, COLORS._main_icon_dark, 1); draw_sprite_ui_uniform(THEME.steam, 0, _boxx + ui(12), yy + ui(12), 1, COLORS._main_icon_dark, 1);
if(meta.author_steam_id == STEAM_USER_ID) { if(meta.author_steam_id == STEAM_USER_ID) {
draw_sprite_ui_uniform(THEME.steam_creator, 0, _boxx + grid_size - ui(8), yy + ui(12), 1, COLORS._main_icon_dark, 1); draw_sprite_ui_uniform(THEME.steam_creator, 0, _boxx + grid_size - ui(8), yy + ui(12), 1, COLORS._main_icon_dark, 1);

2
scripts/save_function/save_function.gml
View file

@ -173,7 +173,7 @@ function SAVE_COLLECTION(_node, _path, save_surface = true, metadata = noone, co
if(save_surface) { if(save_surface) {
var preview_surface = PANEL_PREVIEW.getNodePreviewSurface(); var preview_surface = PANEL_PREVIEW.getNodePreviewSurface();
if(is_surface(preview_surface)) { if(is_surface(preview_surface)) {
var icon_path = string_copy(_path, 1, string_length(_path) - 5) + ".png"; var icon_path = string_replace(_path, filename_ext(_path), "") + ".png";
surface_save_safe(preview_surface, icon_path); surface_save_safe(preview_surface, icon_path);
} }
} }