From a1699d9e4f52925cd974c56f753ca1676d1b1c8f Mon Sep 17 00:00:00 2001
From: Leon Schittek <lone_noel>
Date: Mon, 21 Feb 2022 11:13:34 +0100
Subject: [PATCH] Node Wrangler: more textures for principled texture setup
Differential Revision: https://developer.blender.org/D14134
---
node_wrangler.py | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 44 insertions(+), 3 deletions(-)
diff --git a/node_wrangler.py b/node_wrangler.py
index 05af47d62..ddc7ad505 100644
--- a/node_wrangler.py
+++ b/node_wrangler.py
@@ -3,7 +3,7 @@
bl_info = {
"name": "Node Wrangler",
"author": "Bartek Skorupa, Greg Zaal, Sebastian Koenig, Christian Brinkmann, Florian Meyer",
- "version": (3, 38),
+ "version": (3, 39),
"blender": (2, 93, 0),
"location": "Node Editor Toolbar or Shift-W",
"description": "Various tools to enhance and speed up node-based workflow",
@@ -1137,6 +1137,22 @@ class NWPrincipledPreferences(bpy.types.PropertyGroup):
name='Displacement',
default='displacement displace disp dsp height heightmap',
description='Naming Components for displacement maps')
+ transmission: StringProperty(
+ name='Transmission',
+ default='transmission transparency',
+ description='Naming Components for transmission maps')
+ emission: StringProperty(
+ name='Emission',
+ default='emission emissive emit',
+ description='Naming Components for emission maps')
+ alpha: StringProperty(
+ name='Alpha',
+ default='alpha opacity',
+ description='Naming Components for alpha maps')
+ ambient_occlusion: StringProperty(
+ name='Ambient Occlusion',
+ default='ao ambient occlusion',
+ description='Naming Components for AO maps')
# Addon prefs
class NWNodeWrangler(bpy.types.AddonPreferences):
@@ -1198,6 +1214,10 @@ class NWNodeWrangler(bpy.types.AddonPreferences):
col.prop(tags, "normal")
col.prop(tags, "bump")
col.prop(tags, "displacement")
+ col.prop(tags, "transmission")
+ col.prop(tags, "emission")
+ col.prop(tags, "alpha")
+ col.prop(tags, "ambient_occlusion")
box = layout.box()
col = box.column(align=True)
@@ -3230,6 +3250,10 @@ class NWAddPrincipledSetup(Operator, NWBase, ImportHelper):
['Specular', tags.specular.split(' '), None],
['Roughness', rough_abbr + gloss_abbr, None],
['Normal', normal_abbr + bump_abbr, None],
+ ['Transmission', tags.transmission.split(' '), None],
+ ['Emission', tags.emission.split(' '), None],
+ ['Alpha', tags.alpha.split(' '), None],
+ ['Ambient Occlusion', tags.ambient_occlusion.split(' '), None],
]
# Look through texture_types and set value as filename of first matched file
@@ -3266,6 +3290,7 @@ class NWAddPrincipledSetup(Operator, NWBase, ImportHelper):
print('\nMatched Textures:')
texture_nodes = []
disp_texture = None
+ ao_texture = None
normal_node = None
roughness_node = None
for i, sname in enumerate(socketnames):
@@ -3282,7 +3307,8 @@ class NWAddPrincipledSetup(Operator, NWBase, ImportHelper):
# Add displacement offset nodes
disp_node = nodes.new(type='ShaderNodeDisplacement')
- disp_node.location = active_node.location + Vector((0, -560))
+ # Align the Displacement node under the active Principled BSDF node
+ disp_node.location = active_node.location + Vector((100, -700))
link = links.new(disp_node.inputs[0], disp_texture.outputs[0])
# TODO Turn on true displacement in the material
@@ -3296,6 +3322,17 @@ class NWAddPrincipledSetup(Operator, NWBase, ImportHelper):
continue
+ # AMBIENT OCCLUSION TEXTURE
+ if sname[0] == 'Ambient Occlusion':
+ ao_texture = nodes.new(type='ShaderNodeTexImage')
+ img = bpy.data.images.load(path.join(import_path, sname[2]))
+ ao_texture.image = img
+ ao_texture.label = sname[0]
+ if ao_texture.image:
+ ao_texture.image.colorspace_settings.is_data = True
+
+ continue
+
if not active_node.inputs[sname[0]].is_linked:
# No texture node connected -> add texture node with new image
texture_node = nodes.new(type='ShaderNodeTexImage')
@@ -3343,7 +3380,7 @@ class NWAddPrincipledSetup(Operator, NWBase, ImportHelper):
link = links.new(active_node.inputs[sname[0]], texture_node.outputs[0])
# Use non-color for all but 'Base Color' Textures
- if not sname[0] in ['Base Color'] and texture_node.image:
+ if not sname[0] in ['Base Color', 'Emission'] and texture_node.image:
texture_node.image.colorspace_settings.is_data = True
else:
@@ -3357,6 +3394,10 @@ class NWAddPrincipledSetup(Operator, NWBase, ImportHelper):
if disp_texture:
texture_nodes.append(disp_texture)
+ if ao_texture:
+ # We want the ambient occlusion texture to be the top most texture node
+ texture_nodes.insert(0, ao_texture)
+
# Alignment
for i, texture_node in enumerate(texture_nodes):
offset = Vector((-550, (i * -280) + 200))
--
GitLab