Merge branch 'master' into alpha-association-conversion

Author: williamchange

.github/workflows/godot-templates-build.yml

@@ -0,0 +1,133 @@
+name: Build Export Templates (Single Job)
+
+on:
+  workflow_dispatch:
+
+env:
+    GODOT_VERSION: 4.5.1
+    GODOT_SUB: stable
+    GODOT_DOWNLOAD_DIR: https://github.com/godotengine/godot-builds/releases/download/${GODOT_VERSION}-${GODOT_SUB}
+    SCONSFLAGS: verbose=yes warnings=all use_lto=yes
+
+jobs:
+  build_templates:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout current repo
+        uses: actions/checkout@v4
+        with:
+          path: material-maker
+
+      - name: Clone latest stable Godot source into ./godot
+        run: |
+          git clone --depth 1 --branch ${GODOT_VERSION}-${GODOT_SUB} https://github.com/godotengine/godot.git godot
+          cd godot
+          patch -p1 < ../material-maker/material_maker/misc/mm.patch
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get update
+          sudo apt-get install -y build-essential scons pkg-config libx11-dev \
+            libxcursor-dev libxinerama-dev libgl1-mesa-dev libglu1-mesa-dev \
+            libasound2-dev libpulse-dev libudev-dev libxi-dev libxrandr-dev \
+            libwayland-dev
+          sudo apt-get install -y build-essential scons pkg-config python3 \
+               mingw-w64 clang zip unzip curl git cmake
+          sudo update-alternatives --install /usr/bin/x86_64-w64-mingw32-g++ \
+            x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix 100
+          sudo update-alternatives --install /usr/bin/x86_64-w64-mingw32-gcc \
+            x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix 100
+          sudo update-alternatives --set x86_64-w64-mingw32-g++ \
+            /usr/bin/x86_64-w64-mingw32-g++-posix
+          sudo update-alternatives --set x86_64-w64-mingw32-gcc \
+            /usr/bin/x86_64-w64-mingw32-gcc-posix
+
+      - name: Cache SCons build artifacts
+        uses: actions/cache@v3
+        with:
+          path: |
+            godot/.sconsign.dblite
+            godot/bin/
+          key: ${{ runner.os }}-godot-${{ hashFiles('godot/**/*.cpp', 'godot/**/*.h', 'godot/SConstruct', 'godot/SCsub') }}
+          restore-keys: |
+            ${{ runner.os }}-godot-
+
+      - name: Build export templates (Linux)
+        run: |
+          cd godot
+          scons platform=linuxbsd target=template_release tools=no production=yes
+          cd ..
+
+      - name: Build export templates (Windows)
+        run: |
+          cd godot
+          scons platform=windows target=template_release arch=x86_64 tools=no production=yes
+          cd ..
+
+      - name: Package Linux build
+        run: |
+          mkdir -p templates_linux
+          cp godot/bin/*linuxbsd* templates_linux/
+          (cd templates_linux && zip -9 -r ../export_templates_linux.zip .)
+
+      - name: Package Windows build
+        run: |
+          mkdir -p templates_windows
+          cp godot/bin/*windows* templates_windows/
+          (cd templates_windows && zip -9 -r ../export_templates_windows.zip .)
+
+      - name: Upload Linux artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: linux-templates
+          path: export_templates_linux.zip
+
+      - name: Upload Windows artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: windows-templates
+          path: export_templates_windows.zip
+  build_templates_macos:
+    runs-on: macos-latest
+
+    steps:
+      - name: Checkout current repo
+        uses: actions/checkout@v4
+        with:
+          path: material-maker
+
+      - name: Clone latest stable Godot source into ./godot
+        run: |
+          git clone --depth 1 --branch ${GODOT_VERSION}-${GODOT_SUB} https://github.com/godotengine/godot.git godot
+          cd godot
+          patch -p1 < ../material-maker/material_maker/misc/mm.patch
+
+      - name: Install dependencies
+        run: |
+          brew install scons
+          ./godot/misc/scripts/install_vulkan_sdk_macos.sh
+
+      - name: Cache SCons build artifacts
+        uses: actions/cache@v3
+        with:
+          path: |
+            godot/.sconsign.dblite
+            godot/bin/
+          key: ${{ runner.os }}-godot-${{ hashFiles('godot/**/*.cpp', 'godot/**/*.h', 'godot/SConstruct', 'godot/SCsub') }}
+          restore-keys: |
+            ${{ runner.os }}-godot-
+
+      - name: Build export templates (MacOS)
+        run: |
+          cd godot
+          scons platform=macos arch=x86_64 target=template_release tools=no production=yes
+          scons platform=macos arch=arm64 target=template_release tools=no production=yes generate_bundle=yes
+          cp ./bin/godot_macos.zip ../export_templates_macos.zip
+
+      - name: Upload MacOS artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: macos-templates
+          path: export_templates_macos.zip

LICENSE.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright (c) 2018-2025 Rodolphe Suescun and contributors
+Copyright (c) 2018-present Rodolphe Suescun and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -55,7 +55,7 @@ Translation files can be installed using the **Install** button in the **Prefere
 
 ## License
 
-Copyright (c) 2018-2025 Rodolphe Suescun and contributors
+Copyright (c) 2018-present Rodolphe Suescun and contributors
 
 Unless otherwise specified, files in this repository are licensed under the
 MIT license. See [LICENSE.md](LICENSE.md) for more information.

addons/material_maker/engine/dependencies.gd

@@ -1,6 +1,8 @@
 extends Node
 
 
+signal updated
+
 class Buffer:
 	enum {
 		Invalidated,
@@ -208,6 +210,7 @@ func do_update():
 		if invalidated_buffers == 0:
 			emit_signal("render_queue_empty")
 	updating = false
+	updated.emit()
 
 func get_render_queue_size() -> int:
 	var invalidated_buffers : int = 0

addons/material_maker/engine/nodes/gen_image.gd

@@ -55,7 +55,12 @@ func set_parameter(n : String, v) -> void:
 	super.set_parameter(n, v)
 	if n == "image" and FileAccess.file_exists(v):
 		filetime = get_filetime(v)
-		var image : Image = Image.load_from_file(v)
+		var image : Image = Image.new()
+		if v.get_extension() == "dds":
+			# load_from_file does not work with dds, see godot issue #113063
+			image.load_dds_from_buffer(FileAccess.get_file_as_bytes(v))
+		else:
+			image = Image.load_from_file(v)
 		if image != null:
 			var image_texture : ImageTexture = ImageTexture.create_from_image(image)
 			texture.set_texture(image_texture)
@@ -67,7 +72,10 @@ func _on_timeout() -> void:
 	if filetime != new_filetime:
 		filetime = new_filetime
 		var image : Image = Image.new()
-		image.load(file_path)
+		if file_path.get_extension() == "dds":
+			image.load_dds_from_buffer(FileAccess.get_file_as_bytes(file_path))
+		else:
+			image.load(file_path)
 		var image_texture : ImageTexture = ImageTexture.create_from_image(image)
 		if image_texture:
 			texture.set_texture(image_texture)

addons/material_maker/engine/nodes/gen_iterate_buffer.gd

@@ -181,7 +181,8 @@ func on_dep_update_buffer(buffer_name : String) -> bool:
 
 	is_rendering = true
 
-	var shader_compute : MMShaderCompute = shader_computes[0] if current_iteration == 0 else shader_computes[1]
+	var first_iteration : bool = ( current_iteration == 0 )
+	var shader_compute : MMShaderCompute = shader_computes[0] if first_iteration else shader_computes[1]
 	# Calculate iteration count
 	var iterations = calculate_float_parameter("iterations")
 	if iterations.has("used_named_parameters"):
@@ -231,7 +232,7 @@ func on_dep_update_buffer(buffer_name : String) -> bool:
 	else:
 		set_current_iteration(current_iteration+1)
 
-	
+	mm_deps.dependency_update(buffer_name_init_input if first_iteration else buffer_name_loop_input, texture, true)
 	if current_iteration > iterations:
 		mm_deps.dependency_update(buffer_name_output, texture, true)
 	else:

addons/material_maker/engine/nodes/gen_material.gd

@@ -15,7 +15,7 @@ var update_again : bool = false
 var preview_material : ShaderMaterial = null
 var preview_parameters : Dictionary = {}
 var preview_textures = {}
-var preview_texture_dependencies = {}
+var preview_texture_dependencies : Dictionary[String, MMTexture] = {}
 
 var external_previews : Dictionary[Node, Array] = {}
 var export_output_def : Dictionary
@@ -134,7 +134,7 @@ func on_dep_update_value(buffer_name, parameter_name, value) -> bool:
 				if value is MMTexture:
 					var texture = await value.get_texture()
 					p.set_shader_parameter(parameter_name, texture)
-					preview_texture_dependencies[parameter_name] = texture
+					preview_texture_dependencies[parameter_name] = value
 				else:
 					p.set_shader_parameter(parameter_name, value)
 	else:
@@ -200,8 +200,8 @@ func update() -> void:
 	for u in result.uniforms:
 		if u.value:
 			if u.type == "sampler2D":
+				preview_texture_dependencies[u.name] = u.value
 				var texture = await u.value.get_texture()
-				preview_texture_dependencies[u.name] = texture
 				preview_material.set_shader_parameter(u.name, texture)
 			else:
 				preview_material.set_shader_parameter(u.name, u.value)
@@ -647,7 +647,7 @@ func get_connections_and_parameters_context() -> Dictionary:
 				context["$(param:"+p.name+".a)"] = str(value.a)
 	return context
 
-func export_material(prefix : String, profile : String, size : int = 0) -> void:
+func export_material(prefix : String, profile : String, size : int = 0, command_line : bool = false) -> void:
 	reset_uids()
 	if size == 0:
 		size = get_image_size()
@@ -680,7 +680,7 @@ func export_material(prefix : String, profile : String, size : int = 0) -> void:
 				overwrite_files.push_back(f)
 				continue
 		exported_files.push_back(f)
-	if ! overwrite_files.is_empty():
+	if not command_line and not overwrite_files.is_empty():
 		var dialog = load("res://material_maker/windows/accept_dialog/accept_dialog.tscn").instantiate()
 		dialog.dialog_text = "Overwrite existing files?"
 		for f in overwrite_files:
@@ -692,15 +692,18 @@ func export_material(prefix : String, profile : String, size : int = 0) -> void:
 		if result == "ok":
 			exported_files.append_array(overwrite_files)
 	var progress_dialog = null
-	var progress_dialog_scene = load("res://material_maker/windows/progress_window/progress_window.tscn")
-	if progress_dialog_scene != null:
-		progress_dialog = progress_dialog_scene.instantiate()
-	var dim_color_rect = ColorRect.new()
-	dim_color_rect.modulate = Color(0.05, 0.05, 0.05, 0.5)
-	mm_globals.main_window.add_child(dim_color_rect)
-	get_tree().get_root().add_child(progress_dialog)
-	progress_dialog.set_text("Exporting material")
-	progress_dialog.set_progress(0)
+	var dim_color_rect = null
+	if not command_line:
+		var progress_dialog_scene = load("res://material_maker/windows/progress_window/progress_window.tscn")
+		if progress_dialog_scene != null:
+			progress_dialog = progress_dialog_scene.instantiate()
+		dim_color_rect = ColorRect.new()
+		dim_color_rect.modulate = Color(0.05, 0.05, 0.05, 0.5)
+		mm_globals.main_window.add_child(dim_color_rect)
+	if progress_dialog:
+		get_tree().get_root().add_child(progress_dialog)
+		progress_dialog.set_text("Exporting material")
+		progress_dialog.set_progress(0)
 	var total_files : int = 0
 	for f in exported_files:
 		match f.type:
@@ -711,6 +714,7 @@ func export_material(prefix : String, profile : String, size : int = 0) -> void:
 	var processed_files = 0
 	var error_files = 0
 	for f in exported_files:
+		#print("Exporting ", f)
 		var e: Error = OK
 		match f.type:
 			"texture":
@@ -719,7 +723,7 @@ func export_material(prefix : String, profile : String, size : int = 0) -> void:
 					var render_queue_size : int = mm_deps.get_render_queue_size()
 					while true:
 						mm_deps.update()
-						await get_tree().process_frame
+						await mm_deps.updated
 						if render_queue_size == mm_deps.get_render_queue_size():
 							break
 						render_queue_size = mm_deps.get_render_queue_size()
@@ -744,14 +748,16 @@ func export_material(prefix : String, profile : String, size : int = 0) -> void:
 					e = FAILED
 					processed_files += 1
 					error_files += 1
-					progress_dialog.set_progress(float(processed_files)/float(total_files))
+					if progress_dialog:
+						progress_dialog.set_progress(float(processed_files)/float(total_files))
 					continue
 				var result : MMTexture = await render_output_to_texture(output_index, Vector2i(size, size))
 				e = await result.save_to_file(file_name)
 				if e != OK:
 					error_files += 1
 				processed_files += 1
-				progress_dialog.set_progress(float(processed_files)/float(total_files))
+				if progress_dialog:
+					progress_dialog.set_progress(float(processed_files)/float(total_files))
 			"template":
 				var file_export_context = export_context.duplicate()
 				if f.has("file_params"):
@@ -762,26 +768,37 @@ func export_material(prefix : String, profile : String, size : int = 0) -> void:
 				if e != OK:
 					error_files += 1
 				processed_files += 1
-				progress_dialog.set_progress(float(processed_files)/float(total_files))
+				if progress_dialog:
+					progress_dialog.set_progress(float(processed_files)/float(total_files))
 			"buffers":
-				var index : int = 1
+				# Wait until the render queue is empty
 				if mm_deps.get_render_queue_size() > 0:
-					await mm_deps.render_queue_empty
+					var render_queue_size : int = mm_deps.get_render_queue_size()
+					while true:
+						mm_deps.update()
+						await mm_deps.updated
+						if render_queue_size == mm_deps.get_render_queue_size():
+							break
+						render_queue_size = mm_deps.get_render_queue_size()
+				var index : int = 1
 				for t in preview_texture_dependencies.keys():
 					var file_name = subst_string(f.file_name, export_context)
 					file_name = file_name.replace("$(buffer_index)", str(index))
-					var image : Image = preview_texture_dependencies[t].get_image()
+					var texture : Texture2D = await preview_texture_dependencies[t].get_texture()
+					var image : Image = texture.get_image()
 					if image:
 						image.convert(Image.FORMAT_RGBA8)
 						e = image.save_png(file_name)
 						if e != OK:
 							error_files += 1
 					else:
 						print("No image for texture file ", file_name)
+						print(preview_texture_dependencies[t])
 						error_files += 1
 					index += 1
 					processed_files += 1
-					progress_dialog.set_progress(float(processed_files)/float(total_files))
+					if progress_dialog:
+						progress_dialog.set_progress(float(processed_files)/float(total_files))
 			"buffer_templates":
 				var index : int = 1
 				for t in preview_texture_dependencies.keys():
@@ -797,15 +814,20 @@ func export_material(prefix : String, profile : String, size : int = 0) -> void:
 						error_files += 1
 					index += 1
 					processed_files += 1
-					progress_dialog.set_progress(float(processed_files)/float(total_files))
+					if progress_dialog:
+						progress_dialog.set_progress(float(processed_files)/float(total_files))
 	if progress_dialog != null:
 		progress_dialog.queue_free()
+	if dim_color_rect != null:
 		dim_color_rect.queue_free()
 	if error_files == 0:
 		mm_globals.set_tip_text("Files succesfully exported as \"%s\"" % prefix, 5, 1)
 		return
 	if error_files >= total_files:
-		mm_globals.main_window.accept_dialog("Could not export files to \"%s\"" % prefix.get_base_dir(), false, true)
+		if command_line:
+			print("Could not export files to \"%s\"" % prefix.get_base_dir())
+		else:
+			mm_globals.main_window.accept_dialog("Could not export files to \"%s\"" % prefix.get_base_dir(), false, true)
 		return
 	if error_files < total_files:
 		mm_globals.set_tip_text("%d errors encountered when exporting files" % error_files, 5, 1)