From cb74b7d4f8b72255e0fe8bfcbb0a91d167d86b09 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 20 Nov 2022 20:10:19 +0100 Subject: [PATCH] Updated the engine. --- HEADS | 2 +- game/PaintProject.gd | 19 ++++++------------- game/Project.tscn | 5 ++--- .../color_grid_inxpector_plugin.gd | 8 ++++---- game/project.pandemonium | 2 +- 5 files changed, 14 insertions(+), 22 deletions(-) diff --git a/HEADS b/HEADS index 28d2b56..d1ccbd0 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "64a9e86c5c20bd4bd5833f0563457d0126617489", "3.x": "9b512dd510207d32911064a1bbe15b80c91b006b"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "terraman_2d": {"master": "60a7e84a5dc2fc252b0c582dd8f877685d28d74a"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "rtile_map": {"master": "389070cfef387b69902e23e6c4ac53997b69e42e"}, "props_2d": {"master": "a45822b63519d7f9fb391ab6b1dced468c6f399d"}, "pandemonium_engine": {"master": "fcdce8336cba08dde47b0ccfde6869b0ada7020d"}} \ No newline at end of file +{"engine": {"3.2": "64a9e86c5c20bd4bd5833f0563457d0126617489", "3.x": "9b512dd510207d32911064a1bbe15b80c91b006b"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "terraman_2d": {"master": "60a7e84a5dc2fc252b0c582dd8f877685d28d74a"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "rtile_map": {"master": "389070cfef387b69902e23e6c4ac53997b69e42e"}, "props_2d": {"master": "a45822b63519d7f9fb391ab6b1dced468c6f399d"}, "pandemonium_engine": {"master": "07299fdbf6ed6d62b9bce052d0bfcf5c6fc018ef"}} \ No newline at end of file diff --git a/game/PaintProject.gd b/game/PaintProject.gd index d9ebd57..209a211 100644 --- a/game/PaintProject.gd +++ b/game/PaintProject.gd @@ -1,28 +1,21 @@ tool extends PaintProject -# the new tool should not take space when empty # Port the inspector plugin to c++ aswell # remove old deprecated classes (PaintCanvasOutline, PaintColorGrid too) # inherit both PaintVisualGrid and PaintCanvasBackground from PaintNode -> automatic easy resize -# Rename the paint project editor which is present for all nodes to PaintNode editor # Rename the method that is used to set the inspected PaintNodes in PaintCustomPropertyInspector -# PaintCanvas -> Only consume events if the current tool is select (probably should only route them in the plugin) - -# PaintProject Add open image and texture property, if image dragged to it it creates a canvas from it, if no children -# also adds vis grid, and bg + resizses itself - # New Tools: -# PaintProject: Load image as new canvas, with proper gui -# PaintProject: Scale project ? (to px, or percent) (set scale for all sub nodes?) Might not work well, or just not like this # PaintCanvas: Pixel Scale canvas, should be able to set interpolation (just need gui) -# PaintCanvas -> LoadCanvasImage, exportCanvasImage -> TOOL -# Mouse pos for the canvas property inspector -# PaintProject: Move run properties to the inspector. -# PaintProject: ExportImage -> dialog instead of text field # + run property. Can keel the field to save path though + +# Make sure it works with touch + +# NO Mouse pos for the canvas property inspector ? The canvas editor should be able to do it with an overlay like in the 3d scene +# NO PaintProject: Scale project ? (to px, or percent) (set scale for all sub nodes?) Might not work well, or just not like this +# NO PaintProject Add open image and texture property, if image dragged to it it creates a canvas from it, if no children also adds vis grid, and bg + resizses itself # Eventually: # Filters, vectors ... diff --git a/game/Project.tscn b/game/Project.tscn index 2d776e6..8851900 100644 --- a/game/Project.tscn +++ b/game/Project.tscn @@ -4,9 +4,8 @@ [node name="PaintProject" type="PaintProject"] size = Vector2i( 128, 128 ) -save_file_name = "test.png" -current_color = Color( 0.67914, 0.117493, 0.0852439, 1 ) -color_presets = PoolColorArray( 0.67914, 0.117493, 0.0852439, 1, 0.129412, 0.113725, 0.384314, 1, 0.0666667, 0.796078, 0.196078, 1, 0.0666667, 0.796078, 0.196078, 1, 0.964706, 0.992157, 0.121569, 1, 0.00784314, 0.835294, 0.564706, 1, 0.0666667, 0.796078, 0.196078, 1, 0.658824, 0.313726, 0.207843, 1, 0.34902, 0.376471, 0.803922, 1 ) +current_color = Color( 0.870588, 0.909804, 0.588235, 1 ) +color_presets = PoolColorArray( 0.67914, 0.117493, 0.0852439, 1, 0.129412, 0.113725, 0.384314, 1, 0.0666667, 0.796078, 0.196078, 1, 0.0666667, 0.796078, 0.196078, 1, 0.964706, 0.992157, 0.121569, 1, 0.00784314, 0.835294, 0.564706, 1, 0.619608, 0.639216, 0.815686, 1, 0.658824, 0.313726, 0.207843, 1, 0.34902, 0.376471, 0.803922, 1, 0.870588, 0.909804, 0.588235, 1 ) script = ExtResource( 2 ) [node name="PaintCanvasBackground" type="PaintCanvasBackground" parent="."] diff --git a/game/addons/paint_canvas/color_grid_inxpector_plugin.gd b/game/addons/paint_canvas/color_grid_inxpector_plugin.gd index 495acc2..835cee6 100644 --- a/game/addons/paint_canvas/color_grid_inxpector_plugin.gd +++ b/game/addons/paint_canvas/color_grid_inxpector_plugin.gd @@ -14,7 +14,7 @@ func parse_begin(object: Object) -> void: ptool.on_paint_node_selected(object) add_custom_control(ptool) - #if object is PaintProject: - # var pct : PaintProjectToolsPropertyInspector = PaintProjectToolsPropertyInspector.new() - # pct.on_paint_node_selected(object) - # add_custom_control(pct) + if object is PaintProject: + var pct : PaintProjectToolsPropertyInspector = PaintProjectToolsPropertyInspector.new() + pct.on_paint_node_selected(object) + add_custom_control(pct) diff --git a/game/project.pandemonium b/game/project.pandemonium index 925e389..56cff49 100644 --- a/game/project.pandemonium +++ b/game/project.pandemonium @@ -20,7 +20,7 @@ enabled=PoolStringArray( "res://addons/paint_canvas/plugin.cfg" ) [paint] -color_presets/colors=PoolColorArray( 0.67914, 0.117493, 0.0852439, 1, 0.129412, 0.113725, 0.384314, 1, 0.0666667, 0.796078, 0.196078, 1, 0.0666667, 0.796078, 0.196078, 1, 0.964706, 0.992157, 0.121569, 1, 0.00784314, 0.835294, 0.564706, 1, 0.0666667, 0.796078, 0.196078, 1, 0.658824, 0.313726, 0.207843, 1, 0.34902, 0.376471, 0.803922, 1 ) +color_presets/colors=PoolColorArray( 0.67914, 0.117493, 0.0852439, 1, 0.129412, 0.113725, 0.384314, 1, 0.0666667, 0.796078, 0.196078, 1, 0.0666667, 0.796078, 0.196078, 1, 0.964706, 0.992157, 0.121569, 1, 0.00784314, 0.835294, 0.564706, 1, 0.619608, 0.639216, 0.815686, 1, 0.658824, 0.313726, 0.207843, 1, 0.34902, 0.376471, 0.803922, 1, 0.870588, 0.909804, 0.588235, 1 ) [physics]