Merge branch 'master' into animated-active-connections

Author: williamchange

.github/workflows/create-dmg-bg.sh

@@ -18,7 +18,7 @@ roundrect="roundrectangle -60,-11 60,11, 3,3"
 arrow="'M247.795861,184.47071 L290.200287,218.009412 C293.232498,220.407661 293.746425,224.809919 291.348175,227.84213 C291.011358,228.267982 290.626139,228.653201 290.200287,228.990018 L247.795497,262.529007 C244.763287,264.927257 240.361029,264.413331 237.962779,261.38112 C236.985055,260.144941 236.453122,258.614978 236.453082,257.038881 L236.452673,245.04637 C236.452575,241.180419 233.318555,238.046509 229.452604,238.046546 L161.141914,238.047178 C157.356462,238.047215 154.272786,235.042462 154.145907,231.287896 L154.141845,231.047178 L154.141845,215.952251 C154.141845,212.086285 157.275948,208.952289 161.141914,208.952251 L229.453446,208.951443 C233.319412,208.951405 236.453377,205.81741 236.453377,201.951443 L236.453446,189.961013 C236.453446,186.095019 239.587453,182.961013 243.453446,182.961013 C245.029604,182.961013 246.559635,183.492948 247.795861,184.47071 Z'"
 arrow_pos="180,100"
 
-magick $IMAGE_PATH \
+convert $IMAGE_PATH \
 -resize x330 \
 -gravity center -crop 540x+0+0 \
 -evaluate multiply "$bg_opacity" \
@@ -27,4 +27,4 @@ magick $IMAGE_PATH \
 -fill white -draw "fill-opacity $rect_opacity translate $rect_pos_a $roundrect" \
 -fill white -draw "fill-opacity $rect_opacity translate $rect_pos_b $roundrect" \
 \( -size 800x800 xc:none -fill black -draw "translate $arrow_pos path $arrow" -scale 300x -blur 0x$arrow_shadow_blur  \) -composite \
-\( -size 800x800 xc:none -fill white -draw "translate $arrow_pos path $arrow" -scale 300x \) -composite $BG_OUT_PATH
+\( -size 800x800 xc:none -fill white -draw "translate $arrow_pos path $arrow" -scale 300x \) -composite $BG_OUT_PATH

.github/workflows/dev-desktop-builds.yml

@@ -19,9 +19,9 @@ on:
         default: "true"
 
 env:
-  GODOT_VERSION: 4.6.1
+  GODOT_VERSION: 4.6.2
   GODOT_SUB: stable
-  GODOT_DOWNLOAD_DIR: https://github.com/godotengine/godot-builds/releases/download/4.6.1-stable
+  GODOT_DOWNLOAD_DIR: https://github.com/godotengine/godot-builds/releases/download/4.6.2-stable
   EXPORT_NAME: material_maker
   MM_RELEASE: 1_6
 
@@ -94,24 +94,24 @@ jobs:
           tar zcvf ${EXPORT_NAME}_${MM_RELEASE}_linux.tar.gz ${EXPORT_NAME}_${MM_RELEASE}_linux
       - name: Upload Documentation 🚀
         if: ${{ github.event.inputs.gen_doc == 'true' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: documentation
           path: ./material_maker/doc/_build/html
       - name: Upload Windows Artifact 🚀
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: windows_snapshot
           path: build/${{ env.EXPORT_NAME }}_${{ env.MM_RELEASE }}_windows.zip
       - name: Upload Linux Artifact 🚀
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: linux_snapshot
           path: build/${{ env.EXPORT_NAME }}_${{ env.MM_RELEASE }}_linux.tar.gz
   export-mac:
     name: Mac Export 🍎
     needs: export_windows_linux
-    runs-on: macos-latest
+    runs-on: macos-26
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@v1
@@ -171,11 +171,9 @@ jobs:
           unzip -a ./build/mac/material_maker.zip -d ./build/mac
           chmod +x "./build/mac/Material Maker.app/Contents/MacOS/Material Maker"
           rm ./build/mac/material_maker.zip
-      - name: Fix application icon 🖼
-        run: sips -s format icns "./build/mac/Material Maker.app/Contents/Resources/icon.icns" --out "./build/mac/Material Maker.app/Contents/Resources/icon.icns"
       - name: Get documentation 🚀
         if: ${{ github.event.inputs.gen_doc == 'true' }}
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: documentation
           path: doc
@@ -198,7 +196,7 @@ jobs:
           codesign -s "Rodolphe Suescun" --force --options runtime --timestamp --deep "./build/mac/Material Maker.app"
       - name: Create DMG archive 🔧
         run: |
-          brew update && brew install imagemagick
+          brew update && brew install imagemagick@6
           cp ./.github/workflows/create-dmg-bg.sh .
           chmod +x create-dmg-bg.sh
           ./create-dmg-bg.sh ./splash_screen/backgrounds/pavel_oliva_vintage_luggage.png ./bg.png
@@ -216,7 +214,7 @@ jobs:
           xcrun notarytool submit ./build/mac/material_maker_${{ env.MM_RELEASE }}.dmg --apple-id $APPLE_ID --password $NOTARYTOOL_APP_PASSWORD --team-id $APPLE_TEAM_ID --wait
           xcrun stapler staple ./build/mac/material_maker_${{ env.MM_RELEASE }}.dmg
       - name: Upload Mac OSX Artifact 🚀
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: macos_snapshot
           path: ./build/mac/material_maker_${{ env.MM_RELEASE }}.dmg

CHANGELOG.md

@@ -1,26 +1,53 @@
 # Material Maker 1.6
 
-Mar 8, 2026, ~16h
-
 ## General
 
 - Allowed closing named parameter dialog via window button (contributed by williamchange)
-- Updated graph navigation to retain subgraph offsets (contributed by williamchange)
 - Implemented vertical tabs in the Preferences dialog (contributed by williamchange)
-- Modified the "Update library item" action to keep the thumbnail (contributed by williamchange)
-- Implemented node grabbing via G key (contributed by williamchange)
 - Improved debug console link navigation (contributed by williamchange)
-- Show top-level section labels in the Library panel in bold (contributed by williamchange)
-- Added drag and drop support for image parameter (contributed by williamchange)
-- Improved export node to support $ variables (contributed by williamchange)
 - Enabled tab rearrangement for projects panel (contributed by williamchange)
-- Improved $node to use node title in 2D export (contributed by williamchange)
+- Made tab styles more consistent (contributed by williamchange)
 - Updated icons to use SVG when possible (contributed by williamchange)
 - Configured default FileDialog path to user's home directory (contributed by williamchange)
+- Added documentation for user interface shortcuts (contributed by williamchange)
+- Added a menu item to show examples folder (contributed by williamchange)
+- Added documentation for user interface shortcuts (contributed by williamchange)
+
+### Graph view
+
+- Updated graph navigation to retain subgraph offsets (contributed by williamchange)
+- Added circuit/metro style (diagonal) connections (contributed by williamchange)
+- Implemented node grabbing via G key (contributed by williamchange)
+- Added drag and drop support for image parameter (contributed by williamchange)
+- Made the close/minimize node buttons optional (contributed by williamchange)
+- Improved node interaction when zoomed out (contributed by williamchange)
+- Added port previews for group input nodes (contributed by williamchange)
+- Improved remote parameters rearrangement (contributed by williamchange)
+- Added edge scrolling when dragging connection (contributed by williamchange)
+
+### Library
+
+- Show top-level section labels in the Library panel in bold (contributed by williamchange)
+- Modified the "Update library item" action to keep the thumbnail (contributed by williamchange)
+
+### 2D Preview
+
+- Improved $node to use node title in 2D export (contributed by williamchange)
+- Updated 2D preview to gizmos during transform until LMB is released (contributed by williamchange)
+
+### 3D Preview
+
+- Added alternative inputs for graph panning/camera orbiting (contributed by williamchange)
 
 ## Nodes
 
+- Added controlled variations and related nodes
+- Implemented portal nodes (contributed by williamchange)
+- Added a variadic Color Pick node (contributed by myaaaaaaaaa)
+- Added a basic glTF exporter for static PBR materials (contributed by myaaaaaaaaa)
 - Added lacunarity for FBM noise node (contributed by williamchange)
+- Added gabor noise for FBM noise node (contributed by williamchange)
+- Improved export node to support $ variables (contributed by williamchange)
 
 ## Bug Fixes
 
@@ -31,10 +58,19 @@ Mar 8, 2026, ~16h
 - Reintroduced AO export for Blender export target (contributed by williamchange)
 - Placed graph UI (hierarchy and subgraph controls) above nodes (contributed by williamchange)
 - Updated reroute/preview2d bg checker to match defaults (contributed by williamchange)
+- Fixed console meta navigation on multiple clicks (contributed by williamchange)
+- Fixed group parameters using default values from linked widgets (contributed by williamchange)
+- Fixed hierarchy/subgraph UI position (contributed by williamchange)
+- Fixed crash when opening named parameter editor (contributed by williamchange)
+- Fixed zoom in/out buttons conflicting with node align (contributed by williamchange)
+- Added check to prevent self-referencing in float parameter editor (contributed by williamchange)
+- Fixed lattice, pixels, polygon views not centering (contributed by williamchange)
+- Fixed default lattice point positions (contributed by williamchange)
 
 # Material Maker 1.5p1
 
 ## Bug Fixes
+
 - Fixed problem when exporting materials on command line in Export node
 - Fixed folder picker not showing set path in 2D export (contributed by williamchange)
 - Fixed small FloatEdit sizes in pixel editor (contributed by williamchange)

MaterialMakerLG.icon/.gdignore

@@ -0,0 +1,103 @@
+{
+  "fill" : {
+    "automatic-gradient" : "srgb:1.00000,1.00000,1.00000,1.00000"
+  },
+  "groups" : [
+    {
+      "blur-material-specializations" : [
+        {
+          "value" : null
+        },
+        {
+          "appearance" : "dark",
+          "value" : null
+        }
+      ],
+      "hidden-specializations" : [
+        {
+          "idiom" : "macOS",
+          "value" : false
+        }
+      ],
+      "layers" : [
+        {
+          "image-name" : "mm.svg",
+          "name" : "mm"
+        }
+      ],
+      "lighting-specializations" : [
+        {
+          "appearance" : "dark",
+          "value" : "individual"
+        }
+      ],
+      "position-specializations" : [
+        {
+          "idiom" : "macOS",
+          "value" : {
+            "scale" : 1,
+            "translation-in-points" : [
+              0,
+              0
+            ]
+          }
+        }
+      ],
+      "shadow-specializations" : [
+        {
+          "value" : {
+            "kind" : "layer-color",
+            "opacity" : 0.8
+          }
+        },
+        {
+          "appearance" : "dark",
+          "value" : {
+            "kind" : "neutral",
+            "opacity" : 0.8
+          }
+        },
+        {
+          "appearance" : "tinted",
+          "value" : {
+            "kind" : "layer-color",
+            "opacity" : 0.8
+          }
+        }
+      ],
+      "specular-specializations" : [
+        {
+          "appearance" : "dark",
+          "value" : true
+        }
+      ],
+      "translucency-specializations" : [
+        {
+          "value" : {
+            "enabled" : true,
+            "value" : 0.5
+          }
+        },
+        {
+          "appearance" : "dark",
+          "value" : {
+            "enabled" : true,
+            "value" : 0.5
+          }
+        },
+        {
+          "appearance" : "tinted",
+          "value" : {
+            "enabled" : true,
+            "value" : 0.5
+          }
+        }
+      ]
+    }
+  ],
+  "supported-platforms" : {
+    "squares" : [
+      "macOS"
+    ]
+  }
+}

MaterialMakerLG.icon/Assets/mm.svg

@@ -1,4 +1,4 @@
-[gd_resource type="Theme" load_steps=3 format=3 uid="uid://dssgvu257o1si"]
+[gd_resource type="Theme" format=3 uid="uid://dssgvu257o1si"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_u716c"]
 bg_color = Color(0.43137255, 0.8784314, 0.6156863, 0.5254902)

MaterialMakerLG.icon/icon.json

@@ -72,6 +72,7 @@ func generate_shader(src_code : MMGenBase.ShaderCode) -> String:
 	shader_code += "\nuniform float variation = 0.0;\n"
 	shader_code += "\nvoid fragment() {\n"
 	shader_code += "float _seed_variation_ = variation;\n"
+	shader_code += "vec4 _controlled_variation_ = vec4(0.0);\n"
 	shader_code += "vec2 uv = mm_chunk_offset+mm_chunk_size*UV;\n"
 	if src_code.code != "":
 		shader_code += src_code.code

addons/gut/gui/EditorRadioButton.tres

@@ -27,6 +27,7 @@ const float seed_variation = 0.0;
 
 void main() {
 	float _seed_variation_ = seed_variation;
+	vec4 _controlled_variation_ = vec4(0.0);
 	vec2 pixel = gl_GlobalInvocationID.xy+vec2(0.5, 0.5+mm_chunk_y);
 	vec2 image_size = imageSize(OUTPUT_TEXTURE);
 	vec2 uv = pixel/image_size;

addons/material_maker/engine/multi_renderer.gd

@@ -635,6 +635,22 @@ static func find_matching_parenthesis(string : String, i : int, op : String = '(
 		i = max_p if min_p < 0 else min_p
 	return i
 
+static func split_parameters(string : String) -> Array[String]:
+	if string[0] != "(" or find_matching_parenthesis(string, 0) != string.length()-1:
+		print("bad")
+		return []
+	string = string.substr(1, string.length()-2)
+	var parameters : Array[String] = []
+	var p : String = ""
+	for s in string.split(","):
+		if p != "":
+			p += ","
+		p += s
+		if p.count("(") == p.count(")") and p.count("[") == p.count("]"):
+			parameters.append(p.strip_edges())
+			p = ""
+	return parameters
+
 static var re_line_comment : RegEx = RegEx.create_from_string("//.*")
 
 static func remove_comments(s : String) -> String: