Relintai/pandemonium_paint_experimental
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_paint_experimental.git synced 2024-11-07 16:52:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated the engine. ALso notes.

Browse Source
This commit is contained in:
Relintai 2022-11-19 19:29:11 +01:00
parent df8e27f332
commit 8a7ddacdb5
5 changed files with 23 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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": "71a455687dba22192eeacf4a922911f96b458436"}}
{"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": "f1bda28b11474a6d0e486a5b17fc4cb54091bdfe"}}

4
game/PaintCanvas.gd
View File

@ -514,8 +514,8 @@ func _forward_canvas_gui_input(event: InputEvent) -> bool:
func _ready() -> void:
#temp
resize(1, 1)
resize(128, 128)
#resize(1, 1)
#resize(128, 128)
if !is_connected("current_tool_changed", self, "_on_tool_changed"):
connect("current_tool_changed", self, "_on_tool_changed")

40
game/PaintProject.gd
View File

@ -1,40 +1,24 @@
tool
extends PaintProject
# Declare member variables here. Examples:
# var a: int = 2
# var b: String = "text"
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
pass # Replace with function body.
# add button that ads bg and visual grid, also should set owner so they get saved
# canvas bg make it not use shader
# inherit both from PaintNode -> automatic easy resize
# Implement trickle down resize -> PAitnProject resized -> NOTIFICATION PAINT PROJECT RESIZED!
# PaintNode -> current size property read only
# Resize property + resize button
# Mouse pos for the canvas property inspector
# PaintCanvas -> save data in a compressed form ? -> this is probably the best
# lz4 -> add lz4 module, remove multiple lz4 implementations
# PaintProj -> Collect and merge and save -> NOTIF PaintProject PRE Save , then get image()
# should be saved virtual! only true for canvas for now
# Should apply transforms aswell -> different projects could be put together using scene instancing
# PaintCanvas -> LoadImage
# PaintProject -> new tool, which is only present when its selected:
# ExportImage, Load image as new canvas, scale project tool, and add other run properties to it.
# PaintNodes -> Outline property. Maybe keep node?
# PaintCanvas -> LoadCanvasImage, exportCanvasImage -> TOOL
# PaintCanvas -> scale tool
# Mouse pos for the canvas property inspector
# PaintCanvas -> save data in a compressed form
# port back everything to c++
# Port the inspector plugin to c++ aswell
# remove old deprecated classes
# 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

14
game/Project.tscn
View File

@ -4,19 +4,11 @@
[node name="PaintProject" type="PaintProject"]
size = Vector2i( 128, 128 )
current_color = Color( 0.0666667, 0.796078, 0.196078, 1 )
save_file_name = "test.png"
current_color = Color( 0.658824, 0.313726, 0.207843, 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 )
script = ExtResource( 2 )
[node name="PaintCanvasBackground" type="PaintCanvasBackground" parent="."]
margin_right = 128.0
margin_bottom = 128.0
[node name="PaintVisualGrid" type="PaintVisualGrid" parent="."]
margin_right = 128.0
margin_bottom = 128.0
[node name="PaintCanvas" type="PaintCanvas" parent="."]
size = Vector2i( 128, 128 )
brush_prefab = 1
brush_size = 4
brush_size = 13

5
game/addons/paint_canvas/color_grid_inxpector_plugin.gd
View File

@ -13,3 +13,8 @@ func parse_begin(object: Object) -> void:
var ptool : PaintToolsPropertyInspector = PaintToolsPropertyInspector.new()
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)