Improve 3D Preview Panel & Graph MenuBar

addons/material_maker/loaders/obj_loader.gd

@@ -7,47 +7,47 @@ static func load_obj_file(path : String) -> ArrayMesh:
 	if !ext.matchn("obj"):
 		print("given file isn't an OBJ mesh")
 		return null
-	
+
 	var st := SurfaceTool.new()
 	st.begin(Mesh.PRIMITIVE_TRIANGLES)
-	
+
 	var mdlFile : FileAccess = FileAccess.open(path, FileAccess.READ)
 	if mdlFile == null:
 		print("cannot open file at path[", path,"]")
-		mdlFile.close()
+		#mdlFile.close()
 		return null
 	var newTriMsh : TriMesh = _import_obj(mdlFile)
 	mdlFile.close()
-	
+
 	var hasTex := newTriMsh.uvs.size() > 0
 	var hasNrm := newTriMsh.normals.size() > 0
-	
+
 	for i in newTriMsh.indices.size():
 		var triangle : Triangle = newTriMsh.indices[i]
 		if hasTex:
 			st.set_uv(newTriMsh.uvs[triangle.uv_id_0])
 		if hasNrm:
 			st.set_normal(newTriMsh.normals[triangle.nrm_id_0])
 		st.add_vertex(newTriMsh.vertices[triangle.id_0])
-		
+
 		if hasTex:
 			st.set_uv(newTriMsh.uvs[triangle.uv_id_1])
 		if hasNrm:
 			st.set_normal(newTriMsh.normals[triangle.nrm_id_1])
 		st.add_vertex(newTriMsh.vertices[triangle.id_1])
-		
+
 		if hasTex:
 			st.set_uv(newTriMsh.uvs[triangle.uv_id_2])
 		if hasNrm:
 			st.set_normal(newTriMsh.normals[triangle.nrm_id_2])
 		st.add_vertex(newTriMsh.vertices[triangle.id_2])
-	
+
 	if !hasNrm:
 		st.generate_normals()
 	if hasTex:
 		st.generate_tangents()
 	var mdl : ArrayMesh = st.commit()
-	
+
 	return mdl
 
 static func _obj_rel_indice(indice : Vector3, cur_vArr_size : int) -> Vector3:
@@ -56,20 +56,20 @@ static func _obj_rel_indice(indice : Vector3, cur_vArr_size : int) -> Vector3:
 	output.x = indice.x - 1 if (indSign.x >= 0) else cur_vArr_size + indice.x
 	output.y = indice.y - 1 if (indSign.y >= 0) else cur_vArr_size + indice.y
 	output.z = indice.z - 1 if (indSign.z >= 0) else cur_vArr_size + indice.z
-	
+
 	return output
 
 static func _import_obj(mdlFile : FileAccess) -> TriMesh:
 	var newMsh := TriMesh.new()
-	
+
 	while !mdlFile.eof_reached():
 		var mdlData := mdlFile.get_line()
 		if mdlData.begins_with("#"):
 			continue
-		
+
 		var f2c = mdlData.substr(0, 2)
 		var lineData := mdlData.split(" ", false)
-		
+
 		match f2c:
 			"v ":
 				var vertex := Vector3(
@@ -93,7 +93,7 @@ static func _import_obj(mdlFile : FileAccess) -> TriMesh:
 				newMsh.normals.push_back(normal)
 			"f ":
 				var misc = []
-				
+
 				for i in lineData.size() - 1:
 					misc.push_back(lineData[i + 1].split("/"))
 				for i in misc.size() - 2:
@@ -102,45 +102,45 @@ static func _import_obj(mdlFile : FileAccess) -> TriMesh:
 					var vArr_size : int = newMsh.vertices.size()
 					var tArr_size : int = newMsh.uvs.size()
 					var nArr_size : int = newMsh.normals.size()
-					
+
 					var faceIndices = Vector3(
 					int(misc[intVar][0]),
 					int(misc[intVar-1][0]),
 					int(misc[0][0]))
 					faceIndices = _obj_rel_indice(faceIndices, vArr_size)
-					
+
 					var uvIndices : Vector3
 					if num >= 2:
 						uvIndices = Vector3(
 						int(misc[intVar][1]),
 						int(misc[intVar-1][1]),
 						int(misc[0][1]))
 					uvIndices = _obj_rel_indice(uvIndices, tArr_size)
-					
+
 					var normIndices : Vector3
 					if num == 3:
 						normIndices = Vector3(
 						int(misc[intVar][2]),
 						int(misc[intVar-1][2]),
 						int(misc[0][2]))
 					normIndices = _obj_rel_indice(normIndices, nArr_size)
-					
+
 					var triangle := Triangle.new()
-					
+
 					triangle.id_0 = int(faceIndices.x)
 					triangle.id_1 = int(faceIndices.y)
 					triangle.id_2 = int(faceIndices.z)
-					
+
 					triangle.uv_id_0 = int(uvIndices.x)
 					triangle.uv_id_1 = int(uvIndices.y)
 					triangle.uv_id_2 = int(uvIndices.z)
-					
+
 					triangle.nrm_id_0 = int(normIndices.x)
 					triangle.nrm_id_1 = int(normIndices.y)
 					triangle.nrm_id_2 = int(normIndices.z)
-					
+
 					newMsh.indices.push_back(triangle)
-	
+
 	return newMsh
 
 class TriMesh:

material_maker/environments/hdris/moonless_golf_1k.hdr.import

@@ -3,25 +3,27 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bqre7xkdgb655"
-path="res://.godot/imported/moonless_golf_1k.hdr-9cc5420e458979fa0268bbd265e3a765.ctex"
+path.bptc="res://.godot/imported/moonless_golf_1k.hdr-9cc5420e458979fa0268bbd265e3a765.bptc.ctex"
+path.astc="res://.godot/imported/moonless_golf_1k.hdr-9cc5420e458979fa0268bbd265e3a765.astc.ctex"
 metadata={
-"vram_texture": false
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"vram_texture": true
 }
 
 [deps]
 
 source_file="res://material_maker/environments/hdris/moonless_golf_1k.hdr"
-dest_files=["res://.godot/imported/moonless_golf_1k.hdr-9cc5420e458979fa0268bbd265e3a765.ctex"]
+dest_files=["res://.godot/imported/moonless_golf_1k.hdr-9cc5420e458979fa0268bbd265e3a765.bptc.ctex", "res://.godot/imported/moonless_golf_1k.hdr-9cc5420e458979fa0268bbd265e3a765.astc.ctex"]
 
 [params]
 
-compress/mode=0
+compress/mode=2
 compress/high_quality=false
 compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
-mipmaps/generate=false
+mipmaps/generate=true
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
@@ -31,4 +33,4 @@ process/normal_map_invert_y=false
 process/hdr_as_srgb=false
 process/hdr_clamp_exposure=false
 process/size_limit=0
-detect_3d/compress_to=1
+detect_3d/compress_to=0

material_maker/fonts/DroidSansFallback.ttf.import

@@ -15,13 +15,15 @@ dest_files=["res://.godot/imported/DroidSansFallback.ttf-e30b9821d3711bc136081c8
 Rendering=null
 antialiasing=1
 generate_mipmaps=true
+disable_embedded_bitmaps=true
 multichannel_signed_distance_field=true
 msdf_pixel_range=8
 msdf_size=48
 allow_system_fallback=true
 force_autohinter=true
 hinting=1
 subpixel_positioning=1
+keep_rounding_remainders=true
 oversampling=0.0
 Fallbacks=null
 fallbacks=[]

material_maker/fonts/DroidSansJapanese.ttf.import

@@ -15,13 +15,15 @@ dest_files=["res://.godot/imported/DroidSansJapanese.ttf-22552d3c449e7b4b8df49e5
 Rendering=null
 antialiasing=1
 generate_mipmaps=true
+disable_embedded_bitmaps=true
 multichannel_signed_distance_field=true
 msdf_pixel_range=8
 msdf_size=48
 allow_system_fallback=true
 force_autohinter=true
 hinting=1
 subpixel_positioning=1
+keep_rounding_remainders=true
 oversampling=0.0
 Fallbacks=null
 fallbacks=[]

material_maker/fonts/hack.ttf.import

@@ -15,13 +15,15 @@ dest_files=["res://.godot/imported/hack.ttf-fe4b1180e3e576ff1eae0eea48354ae0.fon
 Rendering=null
 antialiasing=1
 generate_mipmaps=true
+disable_embedded_bitmaps=true
 multichannel_signed_distance_field=true
 msdf_pixel_range=8
 msdf_size=48
 allow_system_fallback=true
 force_autohinter=true
 hinting=1
 subpixel_positioning=1
+keep_rounding_remainders=true
 oversampling=0.0
 Fallbacks=null
 fallbacks=[]

material_maker/fonts/vegur_regular.otf.import

@@ -15,13 +15,15 @@ dest_files=["res://.godot/imported/vegur_regular.otf-b27f03fecf76f08bba1ffc7626d
 Rendering=null
 antialiasing=1
 generate_mipmaps=true
+disable_embedded_bitmaps=true
 multichannel_signed_distance_field=true
 msdf_pixel_range=8
 msdf_size=48
 allow_system_fallback=true
 force_autohinter=true
 hinting=1
 subpixel_positioning=1
+keep_rounding_remainders=true
 oversampling=0.0
 Fallbacks=null
 fallbacks=[]

material_maker/globals.gd

@@ -170,3 +170,24 @@ static func propagate_shortcuts(control : Control, event : InputEvent):
 	if not control.shortcut_context.get_global_rect().has_point(control.get_global_mouse_position()):
 		return
 	do_propagate_shortcuts(control, event)
+
+
+func interpret_file_name(file_name: String, path:="", file_extension:="",additional_identifiers:={}) -> String:
+	for i in additional_identifiers:
+		file_name = file_name.replace(i, additional_identifiers[i])
+
+	var current_graph: MMGraphEdit = get_node("/root/MainWindow").get_current_graph_edit()
+	if current_graph.save_path:
+		file_name = file_name.replace("$project", current_graph.save_path.get_file().trim_suffix("."+current_graph.save_path.get_extension()))
+	else:
+		file_name = file_name.replace("$project", "unnamed_project")
+
+	if "$idx" in file_name:
+		if path:
+			var idx := 1
+			while FileAccess.file_exists(path.path_join(file_name).replace("$idx", str(idx).pad_zeros(2))):
+				idx += 1
+			file_name = file_name.replace("$idx", str(idx).pad_zeros(2))
+		else:
+			file_name = file_name.replace("$idx", str(1).pad_zeros(2))
+	return file_name

material_maker/globals.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=3 uid="uid://vt76awmi7ix7"]
 
-[ext_resource type="Script" path="res://material_maker/globals.gd" id="1"]
-[ext_resource type="Script" path="res://material_maker/globals_menu_manager.gd" id="2"]
+[ext_resource type="Script" uid="uid://cllqlhj3x3jj7" path="res://material_maker/globals.gd" id="1"]
+[ext_resource type="Script" uid="uid://c8lpv0jfyajsp" path="res://material_maker/globals_menu_manager.gd" id="2"]
 
 [node name="Globals" type="Node"]
 script = ExtResource("1")

material_maker/main_window.gd

@@ -941,8 +941,10 @@ func _on_PaintEnvironment_id_pressed(id) -> void:
 		paint.set_environment(id)
 
 
-func environment_editor() -> void:
-	add_child(load("res://material_maker/windows/environment_editor/environment_editor.tscn").instantiate())
+func environment_editor() -> Node:
+	var env_editor : Node = load("res://material_maker/windows/environment_editor/environment_editor.tscn").instantiate()
+	add_child(env_editor)
+	return env_editor
 
 # -----------------------------------------------------------------------
 #                             Help menu
@@ -1025,7 +1027,7 @@ func update_preview_2d() -> void:
 			projects_panel.preview_2d_background.set_generator(generator, output_index)
 
 var current_gen_material = null
-func update_preview_3d(previews : Array, _sequential = false) -> void:
+func update_preview_3d(previews : Array) -> void:
 	var graph_edit : MMGraphEdit = get_current_graph_edit()
 	var gen_material = null
 	if graph_edit != null and graph_edit.top_generator != null and graph_edit.top_generator.has_node("Material"):
@@ -1038,7 +1040,7 @@ func update_preview_3d(previews : Array, _sequential = false) -> void:
 		var materials : Array[ShaderMaterial] = []
 		for p in previews:
 			materials.append_array(p.get_materials())
-		current_gen_material.set_3d_previews(materials)
+		await current_gen_material.set_3d_previews(materials)
 
 func on_preview_changed(graph) -> void:
 	if graph == get_current_graph_edit():
@@ -1053,16 +1055,12 @@ func _on_Projects_tab_changed(_tab) -> void:
 		var new_graph_edit = null
 		if new_tab is GraphEdit:
 			new_graph_edit = new_tab
-			$VBoxContainer/Layout/FlexibleLayout/Main/BackgroundPreviews.show()
-			$VBoxContainer/Layout/FlexibleLayout/Main/PreviewUI.show()
 			set_current_mode("material")
 			if current_mesh and new_graph_edit.top_generator:
 				new_graph_edit.top_generator.set_current_mesh(current_mesh)
 		else:
 			if new_tab.has_method("get_graph_edit"):
 				new_graph_edit = new_tab.get_graph_edit()
-			$VBoxContainer/Layout/FlexibleLayout/Main/BackgroundPreviews.hide()
-			$VBoxContainer/Layout/FlexibleLayout/Main/PreviewUI.hide()
 			set_current_mode("paint")
 		current_tab = new_tab
 		if new_graph_edit != null: