Updated the engine.

This commit is contained in:
Relintai 2022-11-20 21:25:12 +01:00
parent cb74b7d4f8
commit 839caec1f2
4 changed files with 8 additions and 25 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": "07299fdbf6ed6d62b9bce052d0bfcf5c6fc018ef"}} {"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": "1d7ad334071b21e2df901e40100c45c6555b0965"}}

View File

@ -1,22 +1,7 @@
tool tool
extends PaintProject extends PaintProject
# 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 method that is used to set the inspected PaintNodes in PaintCustomPropertyInspector
# New Tools:
# PaintCanvas: Pixel Scale canvas, should be able to set interpolation (just need gui)
# Make sure it works with touch # 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: # Eventually:
# Filters, vectors ... # Filters, vectors ...

View File

@ -13,10 +13,11 @@ func edit(object: Object) -> void:
active_canvas = object active_canvas = object
func _enter_tree() -> void: func _enter_tree() -> void:
ColorGridInspectorPlugin = load("res://addons/paint_canvas/color_grid_inxpector_plugin.gd") pass
#ColorGridInspectorPlugin = load("res://addons/paint_canvas/color_grid_inxpector_plugin.gd")
ip = ColorGridInspectorPlugin.new() #ip = ColorGridInspectorPlugin.new()
add_inspector_plugin(ip) #add_inspector_plugin(ip)
#get_tree().connect("node_removed", self, "on_node_removed") #get_tree().connect("node_removed", self, "on_node_removed")
@ -28,8 +29,9 @@ func _enter_tree() -> void:
#print(sidebar) #print(sidebar)
func _exit_tree() -> void: func _exit_tree() -> void:
if ip: pass
remove_inspector_plugin(ip) #if ip:
# remove_inspector_plugin(ip)
# var paint_editor_plugin : EditorPlugin = Engine.get_global("PaintEditorPlugin") # var paint_editor_plugin : EditorPlugin = Engine.get_global("PaintEditorPlugin")
# #

View File

@ -14,10 +14,6 @@ config/name="Pandemonium Paint Experimental"
run/main_scene="res://Project.tscn" run/main_scene="res://Project.tscn"
config/icon="res://icon.png" config/icon="res://icon.png"
[editor_plugins]
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.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/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 )