From 2f73cc686d5d2cc29dcff1b991f1ac3ec3c2b6c2 Mon Sep 17 00:00:00 2001 From: Tanasart Date: Sun, 12 Nov 2023 20:09:24 +0700 Subject: [PATCH] - [Graph Panel] Fix title of the non-active panel not updating when save all. --- PixelComposer.resource_order | 2 +- PixelComposer.yyp | 4 +- objects/o_dialog_add_node/Create_0.gml | 39 +++++++----------- scripts/panel_data/panel_data.gml | 15 +++---- scripts/panel_graph/panel_graph.gml | 17 ++++---- .../cc497e53-a320-436d-8b85-1c4873ebfb1f.png | Bin 2644 -> 0 bytes .../eb554c28-3115-4dc4-b7a4-5722656750cb.png | Bin 0 -> 2490 bytes .../605130f5-1c72-488d-a143-43e833223f94.png | Bin 2644 -> 0 bytes .../1da6641f-3dd1-4c05-86d8-073a2246c097.png | Bin 0 -> 2490 bytes .../s_node_3d_point_affector.yy | 12 +++--- 10 files changed, 41 insertions(+), 48 deletions(-) delete mode 100644 sprites/s_node_3d_point_affector/cc497e53-a320-436d-8b85-1c4873ebfb1f.png create mode 100644 sprites/s_node_3d_point_affector/eb554c28-3115-4dc4-b7a4-5722656750cb.png delete mode 100644 sprites/s_node_3d_point_affector/layers/cc497e53-a320-436d-8b85-1c4873ebfb1f/605130f5-1c72-488d-a143-43e833223f94.png create mode 100644 sprites/s_node_3d_point_affector/layers/eb554c28-3115-4dc4-b7a4-5722656750cb/1da6641f-3dd1-4c05-86d8-073a2246c097.png diff --git a/PixelComposer.resource_order b/PixelComposer.resource_order index ec4ff7ec8..b28119a94 100644 --- a/PixelComposer.resource_order +++ b/PixelComposer.resource_order @@ -154,6 +154,7 @@ {"name":"pixel builder","order":149,"path":"folders/nodes/icons/pixel builder.yy",}, {"name":"render","order":140,"path":"folders/nodes/icons/render.yy",}, {"name":"rigidSim","order":146,"path":"folders/nodes/icons/rigidSim.yy",}, + {"name":"smokeSim","order":150,"path":"folders/nodes/icons/smokeSim.yy",}, {"name":"strandSim","order":148,"path":"folders/nodes/icons/strandSim.yy",}, {"name":"transform","order":145,"path":"folders/nodes/icons/transform.yy",}, {"name":"value","order":144,"path":"folders/nodes/icons/value.yy",}, @@ -224,7 +225,6 @@ {"name":"button","order":34,"path":"folders/widgets/button.yy",}, {"name":"rotator","order":35,"path":"folders/widgets/rotator.yy",}, {"name":"text","order":36,"path":"folders/widgets/text.yy",}, - {"name":"smokeSim","order":150,"path":"folders/nodes/icons/smokeSim.yy",}, ], "ResourceOrderSettings": [ {"name":"s_node_corner","order":16,"path":"sprites/s_node_corner/s_node_corner.yy",}, diff --git a/PixelComposer.yyp b/PixelComposer.yyp index cc9f83928..f82e9e6a8 100644 --- a/PixelComposer.yyp +++ b/PixelComposer.yyp @@ -151,8 +151,8 @@ {"resourceType":"GMFolder","resourceVersion":"1.0","name":"effect","folderPath":"folders/nodes/data/pixel builder/effect.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"render","folderPath":"folders/nodes/data/render.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"simulation","folderPath":"folders/nodes/data/simulation.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"smokeSim","folderPath":"folders/nodes/data/simulation/smokeSim.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"rigidSim","folderPath":"folders/nodes/data/simulation/rigidSim.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"smokeSim","folderPath":"folders/nodes/data/simulation/smokeSim.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"strandSim","folderPath":"folders/nodes/data/simulation/strandSim.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"VFX","folderPath":"folders/nodes/data/simulation/VFX.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"affector","folderPath":"folders/nodes/data/simulation/VFX/affector.yy",}, @@ -183,6 +183,7 @@ {"resourceType":"GMFolder","resourceVersion":"1.0","name":"pixel builder","folderPath":"folders/nodes/icons/pixel builder.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"render","folderPath":"folders/nodes/icons/render.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"rigidSim","folderPath":"folders/nodes/icons/rigidSim.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"smokeSim","folderPath":"folders/nodes/icons/smokeSim.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"strandSim","folderPath":"folders/nodes/icons/strandSim.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"transform","folderPath":"folders/nodes/icons/transform.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"value","folderPath":"folders/nodes/icons/value.yy",}, @@ -258,7 +259,6 @@ {"resourceType":"GMFolder","resourceVersion":"1.0","name":"button","folderPath":"folders/widgets/button.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"rotator","folderPath":"folders/widgets/rotator.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"text","folderPath":"folders/widgets/text.yy",}, - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"smokeSim","folderPath":"folders/nodes/icons/smokeSim.yy",}, ], "IncludedFiles": [ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"ApolloHelp.html","ConfigValues":{"Itch":{"CopyToMask":"0",},},"CopyToMask":-1,"filePath":"datafiles",}, diff --git a/objects/o_dialog_add_node/Create_0.gml b/objects/o_dialog_add_node/Create_0.gml index 30e8d8246..5df5f6ff2 100644 --- a/objects/o_dialog_add_node/Create_0.gml +++ b/objects/o_dialog_add_node/Create_0.gml @@ -371,15 +371,7 @@ event_inherited(); return 0; } - var node_count = ds_list_size(_list); - - //if(ADD_NODE_PAGE == NODE_PAGE_DEFAULT && array_length(global.FAV_NODES) == 0) { - // draw_set_text(f_h3, fa_center, fa_bottom, COLORS._main_text_sub); - // draw_text(content_pane.w / 2, content_pane.h / 2 - ui(8), "No favorites"); - - // draw_set_text(f_p0, fa_center, fa_top, COLORS._main_text_sub); - // draw_text(content_pane.w / 2, content_pane.h / 2 - ui(4), "Right click on a node and select 'Add to favorite'\nto add node to favorite panel."); - //} + var node_count = ds_list_size(_list); var group_labels = []; if(PREFERENCES.dialog_add_node_view == 0) { //grid @@ -422,18 +414,17 @@ event_inherited(); var _nx = grid_space + (grid_width + grid_space) * cProg; var _boxx = _nx + (grid_width - grid_size) / 2; + var cc = c_white; + + if(is_instanceof(_node, NodeObject)) cc = c_white; + else if(is_instanceof(_node, NodeAction)) cc = COLORS.add_node_blend_action; + else if(is_instanceof(_node, AddNodeItem)) cc = COLORS.add_node_blend_generic; + else cc = COLORS.dialog_add_node_collection; + + BLEND_OVERRIDE + draw_sprite_stretched_ext(THEME.node_bg, 0, _boxx, yy, grid_size, grid_size, cc, 1); + BLEND_NORMAL - BLEND_OVERRIDE; - if(is_instanceof(_node, NodeObject)) - draw_sprite_stretched(THEME.node_bg, 0, _boxx, yy, grid_size, grid_size); - else if(is_instanceof(_node, NodeAction)) - draw_sprite_stretched_ext(THEME.node_bg, 0, _boxx, yy, grid_size, grid_size, COLORS.add_node_blend_action, 1); - else if(is_instanceof(_node, AddNodeItem)) - draw_sprite_stretched_ext(THEME.node_bg, 0, _boxx, yy, grid_size, grid_size, COLORS.add_node_blend_generic, 1); - else - draw_sprite_stretched_ext(THEME.node_bg, 0, _boxx, yy, grid_size, grid_size, COLORS.dialog_add_node_collection, 1); - BLEND_NORMAL; - if(_hover && point_in_rectangle(_m[0], _m[1], _nx, yy, _nx + grid_width, yy + grid_size)) { draw_sprite_stretched_ext(THEME.node_active, 0, _boxx, yy, grid_size, grid_size, COLORS._main_accent, 1); if(mouse_press(mb_left, sFOCUS)) @@ -477,10 +468,12 @@ event_inherited(); if(fav) draw_sprite_ui_uniform(THEME.star, 0, _boxx + grid_size - ui(10), yy + grid_size - ui(10), 0.7, COLORS._main_accent, 1.); } - draw_set_text(f_p2, fa_center, fa_top, COLORS._main_text); - draw_text_ext_add(_boxx + grid_size / 2, yy + grid_size + 4, _node.getName(), -1, grid_width); + var _name = _node.getName(); - var name_height = string_height_ext(_node.getName(), -1, grid_width) + 8; + draw_set_text(f_p2, fa_center, fa_top, COLORS._main_text); + draw_text_ext_add(_boxx + grid_size / 2, yy + grid_size + 4, _name, -1, grid_width); + + var name_height = string_height_ext(_name, -1, grid_width - 4) + 8; curr_height = max(curr_height, grid_size + grid_space + name_height); if(++cProg >= col) { diff --git a/scripts/panel_data/panel_data.gml b/scripts/panel_data/panel_data.gml index 8579daa89..2c74107d1 100644 --- a/scripts/panel_data/panel_data.gml +++ b/scripts/panel_data/panel_data.gml @@ -297,7 +297,8 @@ function Panel(_parent, _x, _y, _w, _h) constructor { function stepBegin() { #region var con = getContent(); - if(con) con.panelStepBegin(self); + for( var i = 0, n = array_length(content); i < n; i++ ) + content[i].panelStepBegin(self); if(o_main.panel_dragging != noone) dragging = -1; @@ -385,19 +386,15 @@ function Panel(_parent, _x, _y, _w, _h) constructor { if(FOCUS == self && con) FOCUS_STR = con.context_str; } else { - for(var i = 0; i < ds_list_size(childs); i++) { - var _panel = childs[| i]; - _panel.stepBegin(); - } + for(var i = 0; i < ds_list_size(childs); i++) + childs[| i].stepBegin(); } } } #endregion static step = function() { #region - for(var i = 0; i < ds_list_size(childs); i++) { - var _panel = childs[| i]; - _panel.step(); - } + for(var i = 0; i < ds_list_size(childs); i++) + childs[| i].step(); } #endregion static draw = function() { #region diff --git a/scripts/panel_graph/panel_graph.gml b/scripts/panel_graph/panel_graph.gml index fa3addd77..9e50ff2aa 100644 --- a/scripts/panel_graph/panel_graph.gml +++ b/scripts/panel_graph/panel_graph.gml @@ -2,6 +2,7 @@ /// @param {Struct.Project} function Panel_Graph(project = PROJECT) : PanelContent() constructor { title = __txt("Graph"); + title_raw = ""; context_str = "Graph"; icon = THEME.panel_graph; @@ -542,6 +543,8 @@ function Panel_Graph(project = PROJECT) : PanelContent() constructor { mouse_grid_x = round(m_x / project.graphGrid.size) * project.graphGrid.size; mouse_grid_y = round(m_y / project.graphGrid.size) * project.graphGrid.size; + + setTitle(); } #endregion function focusNode(_node) { #region @@ -1284,9 +1287,6 @@ function Panel_Graph(project = PROJECT) : PanelContent() constructor { ds_list_delete(node_context, j); nodes_list = node_context[| i].getNodeList(); toCenterNode(); - - var node = getCurrentContext(); - title = node.display_name == ""? node.name : node.display_name; break; } } @@ -1501,16 +1501,19 @@ function Panel_Graph(project = PROJECT) : PanelContent() constructor { context_frame_ey = context_frame_sy + 16; } #endregion + function setTitle() { #region + title = title_raw + (project.modified? "*" : ""); + } #endregion + function drawContent(panel) { #region >>>>>>>>>>>>>>>>>>>> MAIN DRAW <<<<<<<<<<<<<<<<<<<< if(!project.active) return; - if(project.path == "") title = "New project"; - else title = filename_name_only(project.path); - title += project.modified? "*" : ""; + if(project.path == "") title_raw = "New project"; + else title_raw = filename_name_only(project.path); dragGraph(); var context = getCurrentContext(); - if(context != noone) title += " > " + (context.display_name == ""? context.name : context.display_name); + if(context != noone) title_raw += " > " + (context.display_name == ""? context.name : context.display_name); bg_color = context == noone? COLORS.panel_bg_clear : merge_color(COLORS.panel_bg_clear, context.getColor(), 0.05); draw_clear(bg_color); diff --git a/sprites/s_node_3d_point_affector/cc497e53-a320-436d-8b85-1c4873ebfb1f.png b/sprites/s_node_3d_point_affector/cc497e53-a320-436d-8b85-1c4873ebfb1f.png deleted file mode 100644 index 35d96f86c3f4452ac078f61ec8d22630f1ff0147..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2644 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 diff --git a/sprites/s_node_3d_point_affector/eb554c28-3115-4dc4-b7a4-5722656750cb.png b/sprites/s_node_3d_point_affector/eb554c28-3115-4dc4-b7a4-5722656750cb.png new file mode 100644 index 0000000000000000000000000000000000000000..4872d3f36a6a83a36a293038f82a50180ac6b710 GIT binary patch literal 2490 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 literal 0 HcmV?d00001 diff --git a/sprites/s_node_3d_point_affector/layers/cc497e53-a320-436d-8b85-1c4873ebfb1f/605130f5-1c72-488d-a143-43e833223f94.png b/sprites/s_node_3d_point_affector/layers/cc497e53-a320-436d-8b85-1c4873ebfb1f/605130f5-1c72-488d-a143-43e833223f94.png deleted file mode 100644 index 35d96f86c3f4452ac078f61ec8d22630f1ff0147..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2644 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 diff --git a/sprites/s_node_3d_point_affector/layers/eb554c28-3115-4dc4-b7a4-5722656750cb/1da6641f-3dd1-4c05-86d8-073a2246c097.png b/sprites/s_node_3d_point_affector/layers/eb554c28-3115-4dc4-b7a4-5722656750cb/1da6641f-3dd1-4c05-86d8-073a2246c097.png new file mode 100644 index 0000000000000000000000000000000000000000..4872d3f36a6a83a36a293038f82a50180ac6b710 GIT binary patch literal 2490 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 literal 0 HcmV?d00001 diff --git a/sprites/s_node_3d_point_affector/s_node_3d_point_affector.yy b/sprites/s_node_3d_point_affector/s_node_3d_point_affector.yy index eda8dce41..c9041b1ca 100644 --- a/sprites/s_node_3d_point_affector/s_node_3d_point_affector.yy +++ b/sprites/s_node_3d_point_affector/s_node_3d_point_affector.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "s_node_3d_point_affector", - "bbox_bottom": 59, - "bbox_left": 4, + "bbox_bottom": 61, + "bbox_left": 2, "bbox_right": 61, - "bbox_top": 4, + "bbox_top": 2, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, @@ -13,14 +13,14 @@ "edgeFiltering": false, "For3D": false, "frames": [ - {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"cc497e53-a320-436d-8b85-1c4873ebfb1f",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"eb554c28-3115-4dc4-b7a4-5722656750cb",}, ], "gridX": 0, "gridY": 0, "height": 64, "HTile": false, "layers": [ - {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"605130f5-1c72-488d-a143-43e833223f94","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"1da6641f-3dd1-4c05-86d8-073a2246c097","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, ], "nineSlice": null, "origin": 4, @@ -54,7 +54,7 @@ "timeUnits": 1, "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"cc497e53-a320-436d-8b85-1c4873ebfb1f","path":"sprites/s_node_3d_point_affector/s_node_3d_point_affector.yy",},},},"Disabled":false,"id":"6911bb1c-bfd2-4198-99a8-786a0aa40e79","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"eb554c28-3115-4dc4-b7a4-5722656750cb","path":"sprites/s_node_3d_point_affector/s_node_3d_point_affector.yy",},},},"Disabled":false,"id":"9d748969-b939-42fd-ab06-85253e6d7bd4","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null,