Relintai/material-maker
1
0
Fork 0
mirror of https://github.com/Relintai/material-maker.git synced 2025-04-13 12:20:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Detect correctly when loading incorrect files

Browse Source
This commit is contained in:
RodZill4 2020-02-26 23:42:19 +01:00
parent 2b593beb32
commit 84687d2141
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
material_maker/graph_edit.gd
View File

@ -211,16 +211,25 @@ func create_nodes(data, position : Vector2 = Vector2(0, 0)) -> Array:
func create_gen_from_type(gen_name) -> void: func create_gen_from_type(gen_name) -> void:
create_nodes({ type=gen_name, parameters={} }, scroll_offset+0.5*rect_size) create_nodes({ type=gen_name, parameters={} }, scroll_offset+0.5*rect_size)
func load_file(filename) -> void: func load_file(filename) -> bool:
clear_material() var new_generator = mm_loader.load_gen(filename)
top_generator = mm_loader.load_gen(filename) if new_generator != null:
if top_generator != null: clear_material()
top_generator = new_generator
add_child(top_generator) add_child(top_generator)
move_child(top_generator, 0) move_child(top_generator, 0)
update_view(top_generator) update_view(top_generator)
center_view() center_view()
set_save_path(filename) set_save_path(filename)
set_need_save(false) set_need_save(false)
return true
else:
var dialog : AcceptDialog = AcceptDialog.new()
add_child(dialog)
dialog.window_title = "Load failed!"
dialog.dialog_text = "Failed to load "+filename
dialog.popup_centered()
return false
func save_file(filename) -> void: func save_file(filename) -> void:
var data = top_generator.serialize() var data = top_generator.serialize()

12
material_maker/main_window.gd
View File

@ -175,7 +175,6 @@ func create_menu(menu, menu_name) -> PopupMenu:
func create_menu_load_recent(menu) -> void: func create_menu_load_recent(menu) -> void:
menu.clear() menu.clear()
if recent_files.empty(): if recent_files.empty():
menu.add_item("No items found", 0) menu.add_item("No items found", 0)
menu.set_item_disabled(0, true) menu.set_item_disabled(0, true)
@ -186,7 +185,8 @@ func create_menu_load_recent(menu) -> void:
menu.connect("id_pressed", self, "_on_LoadRecent_id_pressed") menu.connect("id_pressed", self, "_on_LoadRecent_id_pressed")
func _on_LoadRecent_id_pressed(id) -> void: func _on_LoadRecent_id_pressed(id) -> void:
do_load_material(recent_files[id]) if !do_load_material(recent_files[id]):
recent_files.remove(id)
func load_recents() -> void: func load_recents() -> void:
var f = File.new() var f = File.new()
@ -313,7 +313,7 @@ func do_load_materials(filenames) -> void:
for f in filenames: for f in filenames:
do_load_material(f) do_load_material(f)
func do_load_material(filename) -> void: func do_load_material(filename) -> bool:
var graph_edit : MMGraphEdit = get_current_graph_edit() var graph_edit : MMGraphEdit = get_current_graph_edit()
var node_count = 2 # So test below succeeds if graph_edit is null... var node_count = 2 # So test below succeeds if graph_edit is null...
if graph_edit != null: if graph_edit != null:
@ -325,8 +325,10 @@ func do_load_material(filename) -> void:
break break
if node_count > 1: if node_count > 1:
graph_edit = new_pane() graph_edit = new_pane()
graph_edit.load_file(filename) if graph_edit.load_file(filename):
add_recent(filename) add_recent(filename)
return true
return false
func save_material() -> void: func save_material() -> void:
var graph_edit : MMGraphEdit = get_current_graph_edit() var graph_edit : MMGraphEdit = get_current_graph_edit()