Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support loading user plugin from .pck #655

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
47 changes: 47 additions & 0 deletions addons/material_maker/engine/loader.gd
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,53 @@ const SHARED_NODES_DIR : String = "user://shared_nodes"
func _ready()-> void:
update_predefined_generators()
load_external_export_targets()
load_plugins()

func load_plugins():
var plugin_dir = DirAccess.open("user://plugins")
if not plugin_dir:
return

var any_plugins_loaded = false

plugin_dir.list_dir_begin()
var plugin_file_name = plugin_dir.get_next()
while (plugin_file_name != ""):
if plugin_dir.current_is_dir():
continue
print("Attempting to load plugin: ", plugin_file_name)
var result = ProjectSettings.load_resource_pack("user://plugins/" + plugin_file_name)
if(result):
print("Loaded successfully")
else:
print("Load failed")

any_plugins_loaded = any_plugins_loaded or result
plugin_file_name = plugin_dir.get_next()

if not any_plugins_loaded:
return

var dir = DirAccess.open("res://mm_plugin")

dir.list_dir_begin()
var file_name = dir.get_next()

while (file_name != ""):
print("Initialising plugin: ", file_name)
var plugin_scene = "res://mm_plugin/" + file_name + "/plugin.tscn"
print(plugin_scene)
file_name = dir.get_next()

if dir.current_is_dir():
if ResourceLoader.exists(plugin_scene) == false:
print("Plugin scene did not exist, this plugin may not be configured correctly")
continue

var plugin = load(plugin_scene)
var plugin_node = plugin.instantiate()
add_child(plugin_node)


func get_predefined_generators_from_dir(path : String) -> void:
var parser
Expand Down
4 changes: 4 additions & 0 deletions addons/material_maker/engine/nodes/gen_graph.gd
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ var label : String = "Graph"
var shortdesc = ""
var longdesc = ""
var connections = []
var plugin_data = {}

var editable : bool = false

Expand Down Expand Up @@ -525,6 +526,7 @@ func _serialize(data: Dictionary) -> Dictionary:
data.shortdesc = shortdesc
data.longdesc = longdesc
data.nodes = []
data.plugin_data = plugin_data
for c in get_children():
data.nodes.append(c.serialize())
#data.connections = connections_to_compact(connections)
Expand All @@ -538,6 +540,8 @@ func _deserialize(data : Dictionary) -> void:
shortdesc = data.shortdesc
if data.has("longdesc"):
longdesc = data.longdesc
if data.has("plugin_data"):
plugin_data = data.plugin_data
var nodes = data.nodes if data.has("nodes") else []
var connection_array : Array = []
if data.has("connections"):
Expand Down
10 changes: 9 additions & 1 deletion material_maker/main_window.gd
Original file line number Diff line number Diff line change
Expand Up @@ -219,16 +219,24 @@ func _ready() -> void:
if get_current_graph_edit() == null:
await get_tree().process_frame
new_material()

update_menus()

plugin_ui_loaded.call_deferred()

var menu_update_requested : bool = false

func update_menus() -> void:
if ! menu_update_requested:
menu_update_requested = true
do_update_menus.call_deferred()

func plugin_ui_loaded():
var children = mm_loader.get_children()
for child in children:
if child.has_method("on_ui_loaded"):
child.on_ui_loaded()

func do_update_menus() -> void:
# Create menus
var menu_bar_class
Expand Down
2 changes: 1 addition & 1 deletion material_maker/main_window.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=19 format=3 uid="uid://cgfeik04a5qqs"]
[gd_scene load_steps=19 format=3 uid="uid://xycv1evlfpuf"]

[ext_resource type="Script" path="res://material_maker/main_window.gd" id="1"]
[ext_resource type="Script" path="res://material_maker/main_window_layout.gd" id="2"]
Expand Down
3 changes: 3 additions & 0 deletions material_maker/windows/export_animation/export_animation.gd
Airyzz marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ func _on_Export_pressed():
dialog.add_filter("*.png;PNG image files")
add_child(dialog)
var files = await dialog.select_files()
do_export(files)

func do_export(files):
if files.size() > 0:
var filename : String = files[0]
var size : int = 1 << value_size.size_value
Expand Down