Shader: Add Roughness to Subsurface Scattering Node #114499

~~I took a quick look, the only test that fails is subsurface mix. The issue is very likely caused by the changes in intern/cycles/scene/shader_nodes.cpp.~~

It seems I'm doing something wrong with the closure and/or mix weight of materials. I just can't figure out what I'm doing wrong. I'll investigate it further, but if you have any insights that might help, feel free to share.

Edit: This has been fixed ~~I took a quick look, the only test that fails is subsurface mix. The issue is very likely caused by the changes in `intern/cycles/scene/shader_nodes.cpp`.~~ ~~It seems I'm doing something wrong with the closure and/or mix weight of materials. I just can't figure out what I'm doing wrong. I'll investigate it further, but if you have any insights that might help, feel free to share.~~

Alaska added 1 commit 2023-11-06 11:32:10 +01:00

bde9beb970 Add node for normal

Alaska commented

2023-11-06 11:32:38 +01:00

Turns out adding a node for the normal input fixes the issue.

Along with that it fixes an issue where the normal input wasn't being read.

Turns out adding a node for the normal input fixes the issue. Along with that it fixes an issue where the normal input wasn't being read.

Alaska added 1 commit 2023-11-07 05:57:10 +01:00

buildbot/vexp-code-patch-coordinator Build done. Details

091443d580 Merge branch 'main'

Conflicts:
	source/blender/blenloader/intern/versioning_400.cc

Alaska requested review from Brecht Van Lommel 2023-11-07 06:00:11 +01:00

Brecht Van Lommel commented

2023-11-08 20:00:08 +01:00

@blender-bot build

Alaska added 1 commit 2023-11-16 05:54:29 +01:00

9bb600192f Merge branch 'main'

Conflicts:
	source/blender/blenkernel/BKE_blender_version.h

Lukas Stockner approved these changes 2023-11-18 19:30:28 +01:00

Alaska added 1 commit 2024-01-10 05:38:54 +01:00

65af8e1295 Merge branch 'main'

Conflicts:
	source/blender/blenkernel/BKE_blender_version.h

Alaska referenced this pull request

2024-01-29 02:05:32 +01:00

Shader: Add specular tint to Glass BSDF #114354

Alaska added 1 commit 2024-02-23 12:24:15 +01:00

bab6c7df89 Merge branch 'main' into update-sss

Lukas Stockner reviewed 2024-03-03 23:48:53 +01:00

Lukas Stockner left a comment

Not sure what the status here is, I think this is ready to merge?

I've looked over it once more and found one detail, otherwise still LGTM.

Not sure what the status here is, I think this is ready to merge? I've looked over it once more and found one detail, otherwise still LGTM.

intern/cycles/scene/shader_nodes.cpp Outdated

						
				@ -2911,0 +2925,4 @@

				  ShaderInput *anisotropy_in = input("Anisotropy");

				  int normal_offset = compiler.stack_assign_if_linked(input("Normal"));

				  compiler.add_node(NODE_CLOSURE_BSDF,

Lukas Stockner commented

2024-03-03 23:47:41 +01:00

While this works, I just noticed there's a cleaner way to handle this.

Currently, BsdfNode::compile always reserves an entry for a Tangent input - however, only three nodes (Glossy, Principled, Hair) actually use it. So, we might as well make it a param5 input, pass input("Tangent") from these nodes, and pass input("Roughness") from here.

This also saves us two NODE_VALUE_F if Scale and IOR are fixed.

While this works, I just noticed there's a cleaner way to handle this. Currently, `BsdfNode::compile` always reserves an entry for a Tangent input - however, only three nodes (Glossy, Principled, Hair) actually use it. So, we might as well make it a `param5` input, pass `input("Tangent")` from these nodes, and pass `input("Roughness")` from here. This also saves us two `NODE_VALUE_F` if Scale and IOR are fixed.

Alaska added 1 commit 2024-03-04 02:53:07 +01:00

2c9ab876e5 Merge branch 'main' into update-sss

Alaska commented

2024-03-04 02:56:32 +01:00

I experimented with the proposed idea of turning input("Tangent") into param5. But ran into some quirks so I haven't included any of the code changes here. Either way, it's a good idea, but I think it's best if that's handled as a seperate pull request that either gets merged into main before this one, or after this one.

~~I'll experiment some more and see if I can create a seperate pull request.~~
I've created a work in progress pull request here: #119042

I experimented with the proposed idea of turning `input("Tangent")` into `param5`. But ran into some quirks so I haven't included any of the code changes here. Either way, it's a good idea, but I think it's best if that's handled as a seperate pull request that either gets merged into main before this one, or after this one. ~~I'll experiment some more and see if I can create a seperate pull request.~~ I've created a work in progress pull request here: #119042

Alaska referenced this pull request

2024-03-04 05:06:44 +01:00

Cycles Refactor: Replace fixed Tangent input with custom input #119042

Alaska referenced this pull request

2024-04-23 02:55:34 +02:00

Cycles Refactor: Replace fixed Tangent input with custom input #119042

Alaska added 1 commit 2024-04-27 02:07:18 +02:00

9aa3dc9722 Merge branch 'main' into update-sss

Alaska added 1 commit 2024-04-27 02:09:09 +02:00

28cbc36fb6 Shift EEVEE roughness clamp

This pull request can be merged automatically.

This branch is out-of-date with the base branch