Updated the engine.

This commit is contained in:
Relintai 2022-11-20 20:10:19 +01:00
parent cd4fab017e
commit cb74b7d4f8
5 changed files with 14 additions and 22 deletions

2
HEADS
View File

@ -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"}} {"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"}}

View File

@ -1,28 +1,21 @@
tool tool
extends PaintProject extends PaintProject
# the new tool should not take space when empty
# Port the inspector plugin to c++ aswell # Port the inspector plugin to c++ aswell
# remove old deprecated classes (PaintCanvasOutline, PaintColorGrid too) # remove old deprecated classes (PaintCanvasOutline, PaintColorGrid too)
# inherit both PaintVisualGrid and PaintCanvasBackground from PaintNode -> automatic easy resize # 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 # 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: # 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: Pixel Scale canvas, should be able to set interpolation (just need gui)
# PaintCanvas -> LoadCanvasImage, exportCanvasImage -> TOOL
# Mouse pos for the canvas property inspector # Make sure it works with touch
# PaintProject: Move run properties to the inspector.
# PaintProject: ExportImage -> dialog instead of text field # + run property. Can keel the field to save path though # 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: # Eventually:
# Filters, vectors ... # Filters, vectors ...

View File

@ -4,9 +4,8 @@
[node name="PaintProject" type="PaintProject"] [node name="PaintProject" type="PaintProject"]
size = Vector2i( 128, 128 ) size = Vector2i( 128, 128 )
save_file_name = "test.png" current_color = Color( 0.870588, 0.909804, 0.588235, 1 )
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.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 )
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 )
script = ExtResource( 2 ) script = ExtResource( 2 )
[node name="PaintCanvasBackground" type="PaintCanvasBackground" parent="."] [node name="PaintCanvasBackground" type="PaintCanvasBackground" parent="."]

View File

@ -14,7 +14,7 @@ func parse_begin(object: Object) -> void:
ptool.on_paint_node_selected(object) ptool.on_paint_node_selected(object)
add_custom_control(ptool) add_custom_control(ptool)
#if object is PaintProject: if object is PaintProject:
# var pct : PaintProjectToolsPropertyInspector = PaintProjectToolsPropertyInspector.new() var pct : PaintProjectToolsPropertyInspector = PaintProjectToolsPropertyInspector.new()
# pct.on_paint_node_selected(object) pct.on_paint_node_selected(object)
# add_custom_control(pct) add_custom_control(pct)

View File

@ -20,7 +20,7 @@ enabled=PoolStringArray( "res://addons/paint_canvas/plugin.cfg" )
[paint] [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] [physics]