Details

Reviewers

Brecht Van Lommel (brecht)
Jacques Lucke (JacquesLucke)

Commits

rCa6f29cf8525a: Shading: Add More Features To The Voronoi Node
rB613b37bc2c81: Shading: Add More Features To The Voronoi Node.

Summary

This patch allows the Voronoi node to operate in 1D, 2D, and 4D space.
It also adds a Randomness input to control the randomness of the texture.
Additionally, it adds three new modes of operation:

Smooth F1: A smooth version of F1 Voronoi with no discontinuities.
Distance To Edge: Returns the distance to the edges of the cells.
N-Sphere Radius: Returns the radius of the n-sphere inscribed in the cells. In other words, it is half the distance between the closest point and the point closest to it.

And it removes the following three modes of operation:

F3.
F4.
Cracks.

This breaks backward compatibility in many ways, including the base case.
The versioning code will be added shortly after.

Diff Detail

Repository

rB Blender

Branch

voronoi-node (branched from master)

Build Status

Buildable 4891
Build 4891: arc lint + arc unit

Event Timeline

Omar Emara (OmarSquircleArt) created this revision.Sep 10 2019, 4:21 PM

Harbormaster completed remote builds in B4878: Diff 18046.Sep 10 2019, 4:21 PM

Not sure if this related to the missing versioning, but these test failures probably indicate a bug in the texture code itself:

@Brecht Van Lommel (brecht) Pretty sure this is due to missing versioning, probably due to the fact that the dimensions property is set to zero, so the appropriate function is not called and what ever in memory is displayed.

I though I would upload the patch for review while I do the versioning to conserve time. Is this fine?

It's fine. I guess it can indeed be caused by versioning if the enum values are wrong.

Jacques Lucke (JacquesLucke) added inline comments.Sep 10 2019, 5:49 PM

intern/cycles/kernel/svm/svm_voronoi.h
610	code style, missing braces.
632	more missing braces

Omar Emara (OmarSquircleArt) mentioned this in T68823: GSoC 2019 - Cycles/EEVEE Improvements.Sep 10 2019, 6:15 PM

Add versioning code. Versioning for coloring is still missing.
Follow coding style.

Harbormaster completed remote builds in B4887: Diff 18060.Sep 10 2019, 9:19 PM

Omar Emara (OmarSquircleArt) marked 2 inline comments as done.Sep 10 2019, 9:20 PM

Clean up. Remove unused functions.

Harbormaster completed remote builds in B4890: Diff 18063.Sep 10 2019, 9:31 PM

Add versioning code for coloring.

Harbormaster completed remote builds in B4891: Diff 18068.Sep 10 2019, 11:09 PM

A file to test versioning code:

voronoi_node_versioning.blend747 KBDownload

These are the current test failures:

Ideally only the pattern changes, but for many of these the overall color or intensity is also different. Is it possible to get closer?

@Brecht Van Lommel (brecht) It appears the distance output should be the squared distance, not the actual distance, will add versioning code for that.

Add versioning code for squared euclidean distance.

Harbormaster completed remote builds in B4902: Diff 18093.Sep 11 2019, 12:58 PM

The tests looks like this now.

The color of the last test changed because the Voronoi scale is very small and the output is connected to a color ramp whose last color ramp element is yellow.

When switching features, it seems to somehow keep using the disabled link in Cycles and produces broken output.

For example in this test file, switch to "Distance to Edge", set viewport to Rendered and rotate around to see artifacts.
https://developer.blender.org/diffusion/BL/browse/trunk/lib/tests/render/reports/T53600.blend

@Brecht Van Lommel (brecht) That's because Cycles doesn't take into account unavailable sockets while generating the shader graph from the BL nodetree. In my branch, I fixed that in this commit 228edc58. But this is not really related to Voronoi.

Should I create a patch for this?

In D5743#132464, @Omar Emara (OmarSquircleArt) wrote:

@Brecht Van Lommel (brecht) That's because Cycles doesn't take into account unavailable sockets while generating the shader graph from the BL nodetree. In my branch, I fixed that in this commit 228edc58. But this is not really related to Voronoi.

Should I create a patch for this?

You can commit that directly to master, 228edc58 seems fine.

Brecht Van Lommel (brecht) added inline comments.Sep 12 2019, 12:58 AM

intern/cycles/util/util_math_float4.h
453–465	Move these two functions right after the `fabs()` implementation, otherwise they are not implemented for CUDA.

Define the floor and mix functions in CUDA.

Harbormaster completed remote builds in B4926: Diff 18149.Sep 12 2019, 12:03 PM

I am getting about 2% performance regression on benchmark scenes with CUDA, while CPU is unaffected. I think this acceptable for now and we can try to gain that back later.

This revision is now accepted and ready to land.Sep 12 2019, 12:38 PM

Closed by commit rB613b37bc2c81: Shading: Add More Features To The Voronoi Node. (authored by Omar Emara (OmarSquircleArt)). · Explain WhySep 12 2019, 1:12 PM

This revision was automatically updated to reflect the committed changes.

Omar Emara (OmarSquircleArt) added a commit: rB613b37bc2c81: Shading: Add More Features To The Voronoi Node..

Duarte Farrajota Ramos (duarteframos) awarded a token.Sep 13 2019, 1:13 AM

Duarte Farrajota Ramos (duarteframos) added a subscriber: Duarte Farrajota Ramos (duarteframos).

Charlie Jolly (charlie) mentioned this in D3673: Cycles Noise, Voronoi Edge Along Surface Normal.Sep 25 2019, 11:27 AM

Charlie Jolly (charlie) mentioned this in D3743: Tiled Voronoi Noise : Cycles, Eevee and OSL.Sep 25 2019, 11:29 AM

Charlie Jolly (charlie) mentioned this in T72337: Shader Node Additions.Dec 10 2019, 6:53 PM

Nathan Letwory (jesterking) added a commit: rCa6f29cf8525a: Shading: Add More Features To The Voronoi Node.Jan 13 2020, 11:25 PM

Shading: Add More Features To The Voronoi Node.
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 18068

intern/cycles/blender/blender_shader.cpp

intern/cycles/kernel/closure/bsdf_util.h

intern/cycles/kernel/shaders/CMakeLists.txt

intern/cycles/kernel/shaders/node_hash.h

intern/cycles/kernel/shaders/node_voronoi_texture.osl

intern/cycles/kernel/svm/svm.h

intern/cycles/kernel/svm/svm_noise.h

intern/cycles/kernel/svm/svm_types.h

intern/cycles/kernel/svm/svm_voronoi.h

intern/cycles/render/nodes.h

intern/cycles/render/nodes.cpp

intern/cycles/util/util_math.h

intern/cycles/util/util_math_float2.h

intern/cycles/util/util_math_float3.h

intern/cycles/util/util_math_float4.h

source/blender/blenkernel/BKE_blender_version.h

source/blender/blenloader/intern/versioning_cycles.c

source/blender/editors/space_node/drawnode.c

source/blender/gpu/CMakeLists.txt

source/blender/gpu/intern/gpu_material_library.h

source/blender/gpu/shaders/material/gpu_shader_material_cell_noise.glsl

source/blender/gpu/shaders/material/gpu_shader_material_math_util.glsl

source/blender/gpu/shaders/material/gpu_shader_material_tex_voronoi.glsl

source/blender/makesdna/DNA_node_types.h

source/blender/makesrna/intern/rna_nodetree.c

source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c

Shading: Add More Features To The Voronoi Node.ClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 18068

intern/cycles/blender/blender_shader.cpp

intern/cycles/kernel/closure/bsdf_util.h

intern/cycles/kernel/shaders/CMakeLists.txt

intern/cycles/kernel/shaders/node_hash.h

intern/cycles/kernel/shaders/node_voronoi_texture.osl

intern/cycles/kernel/svm/svm.h

intern/cycles/kernel/svm/svm_noise.h

intern/cycles/kernel/svm/svm_types.h

intern/cycles/kernel/svm/svm_voronoi.h

intern/cycles/render/nodes.h

intern/cycles/render/nodes.cpp

intern/cycles/util/util_math.h

intern/cycles/util/util_math_float2.h

intern/cycles/util/util_math_float3.h

intern/cycles/util/util_math_float4.h

source/blender/blenkernel/BKE_blender_version.h

source/blender/blenloader/intern/versioning_cycles.c

source/blender/editors/space_node/drawnode.c

source/blender/gpu/CMakeLists.txt

source/blender/gpu/intern/gpu_material_library.h

source/blender/gpu/shaders/material/gpu_shader_material_cell_noise.glsl

source/blender/gpu/shaders/material/gpu_shader_material_math_util.glsl

source/blender/gpu/shaders/material/gpu_shader_material_tex_voronoi.glsl

source/blender/makesdna/DNA_node_types.h

source/blender/makesrna/intern/rna_nodetree.c

source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c

Shading: Add More Features To The Voronoi Node.
ClosedPublic
Actions

Revision Contents
Changeset List