From 042fbefac686666190915d206600a5dab8e03066 Mon Sep 17 00:00:00 2001 From: Julien Duroure Date: Thu, 7 Jul 2022 08:03:39 +0200 Subject: glTF importer/exporter: Manage some official Khronos Extensions about Materials KHR_materials_ior KHR_materials_sheen KHR_materials_specular KHR_materials_transmission KHR_materials_variants KHR_materials_emissive_strength KHR_materials_volume Documentation update is still in progress --- .../blender/com/gltf2_blender_material_helpers.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py') diff --git a/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py b/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py index 7b90b0a3..a44562a1 100755 --- a/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py +++ b/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py @@ -9,7 +9,25 @@ def get_gltf_node_name(): def create_settings_group(name): gltf_node_group = bpy.data.node_groups.new(name, 'ShaderNodeTree') gltf_node_group.inputs.new("NodeSocketFloat", "Occlusion") + thicknessFactor = gltf_node_group.inputs.new("NodeSocketFloat", "Thickness") + thicknessFactor.default_value = 1.0 gltf_node_group.nodes.new('NodeGroupOutput') gltf_node_group_input = gltf_node_group.nodes.new('NodeGroupInput') gltf_node_group_input.location = -200, 0 - return gltf_node_group \ No newline at end of file + return gltf_node_group + +def get_gltf_pbr_non_converted_name(): + return "original glTF PBR data" + +def create_gltf_pbr_non_converted_group(name): + gltf_node_group = bpy.data.node_groups.new(name, 'ShaderNodeTree') + + specular = gltf_node_group.inputs.new("NodeSocketFloat", "specular glTF") + specular.default_value = 1.0 + specularColor = gltf_node_group.inputs.new("NodeSocketColor", "specularColor glTF") + specularColor.default_value = [1.0,1.0,1.0,1.0] + + gltf_node_group.nodes.new('NodeGroupOutput') + gltf_node_group_input = gltf_node_group.nodes.new('NodeGroupInput') + gltf_node_group_input.location = -400, 0 + return gltf_node_group \ No newline at end of file -- cgit v1.2.3 From c58c8f3c3525247c6f584684260eae4ea87a57a3 Mon Sep 17 00:00:00 2001 From: Julien Duroure Date: Sat, 6 Aug 2022 12:07:14 +0200 Subject: glTF: rename glTF Settings node to glTF Material Output --- io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py') diff --git a/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py b/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py index a44562a1..0bca9933 100755 --- a/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py +++ b/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py @@ -3,9 +3,13 @@ import bpy -def get_gltf_node_name(): +# Get compatibility at export with old files +def get_gltf_node_old_name(): return "glTF Settings" +def get_gltf_node_name(): + return "glTF Material Output" + def create_settings_group(name): gltf_node_group = bpy.data.node_groups.new(name, 'ShaderNodeTree') gltf_node_group.inputs.new("NodeSocketFloat", "Occlusion") -- cgit v1.2.3 From eca1bdeb88a35deeaec8f2969953dd6d503315a3 Mon Sep 17 00:00:00 2001 From: Julien Duroure Date: Sat, 6 Aug 2022 12:15:54 +0200 Subject: glTF exporter: KHR_material_volume: thickness is now default to 0.0 (as in specification) --- io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py') diff --git a/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py b/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py index 0bca9933..7dfef7dc 100755 --- a/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py +++ b/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py @@ -14,7 +14,7 @@ def create_settings_group(name): gltf_node_group = bpy.data.node_groups.new(name, 'ShaderNodeTree') gltf_node_group.inputs.new("NodeSocketFloat", "Occlusion") thicknessFactor = gltf_node_group.inputs.new("NodeSocketFloat", "Thickness") - thicknessFactor.default_value = 1.0 + thicknessFactor.default_value = 0.0 gltf_node_group.nodes.new('NodeGroupOutput') gltf_node_group_input = gltf_node_group.nodes.new('NodeGroupInput') gltf_node_group_input.location = -200, 0 -- cgit v1.2.3 From ae29cfd1860e53e61d1b58d9c406638927a8ab40 Mon Sep 17 00:00:00 2001 From: Julien Duroure Date: Mon, 8 Aug 2022 17:03:41 +0200 Subject: glTF: Merge glTF Material Output nodes into a single one --- .../blender/com/gltf2_blender_material_helpers.py | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py') diff --git a/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py b/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py index 7dfef7dc..4f8417e9 100755 --- a/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py +++ b/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py @@ -17,21 +17,9 @@ def create_settings_group(name): thicknessFactor.default_value = 0.0 gltf_node_group.nodes.new('NodeGroupOutput') gltf_node_group_input = gltf_node_group.nodes.new('NodeGroupInput') - gltf_node_group_input.location = -200, 0 - return gltf_node_group - -def get_gltf_pbr_non_converted_name(): - return "original glTF PBR data" - -def create_gltf_pbr_non_converted_group(name): - gltf_node_group = bpy.data.node_groups.new(name, 'ShaderNodeTree') - - specular = gltf_node_group.inputs.new("NodeSocketFloat", "specular glTF") + specular = gltf_node_group.inputs.new("NodeSocketFloat", "Specular") specular.default_value = 1.0 - specularColor = gltf_node_group.inputs.new("NodeSocketColor", "specularColor glTF") + specularColor = gltf_node_group.inputs.new("NodeSocketColor", "Specular Color") specularColor.default_value = [1.0,1.0,1.0,1.0] - - gltf_node_group.nodes.new('NodeGroupOutput') - gltf_node_group_input = gltf_node_group.nodes.new('NodeGroupInput') - gltf_node_group_input.location = -400, 0 - return gltf_node_group \ No newline at end of file + gltf_node_group_input.location = -200, 0 + return gltf_node_group -- cgit v1.2.3