Page MenuHome
Differential D12733

Geometry Nodes: Add Wave texture node
ClosedPublic
Actions

Authored by Charlie Jolly (charlie) on Oct 2 2021, 8:37 PM.

Details

Reviewers
Jacques Lucke (JacquesLucke)
Hans Goudey (HooglyBoogly)
Commits
rB67dbb42236da: Geometry Nodes: Add Wave texture node
Summary

Port shader wave texture node

Diff Detail

Repository
rB Blender

Event Timeline

Charlie Jolly (charlie) requested review of this revision.Oct 2 2021, 8:37 PM
Charlie Jolly (charlie) created this revision.
Harbormaster completed remote builds in B17513: Diff 42820.Oct 2 2021, 8:37 PM
Paul Larson (GeorgiaPacific) added a subscriber: Paul Larson (GeorgiaPacific).Oct 4 2021, 1:20 AM
Charlie Jolly (charlie) added a project: Geometry Nodes.Oct 5 2021, 11:00 PM
Charlie Jolly (charlie) updated this revision to Diff 43025.Oct 7 2021, 9:07 PM

Rebase to master

Harbormaster completed remote builds in B17638: Diff 43025.Oct 7 2021, 9:07 PM
Charlie Jolly (charlie) updated this revision to Diff 43567.Oct 19 2021, 2:33 PM

Rebase to master

Harbormaster completed remote builds in B17997: Diff 43567.Oct 19 2021, 2:33 PM
Jacques Lucke (JacquesLucke) requested changes to this revision.Oct 19 2021, 2:48 PM

I assume you compared this to shader nodes again?

source/blender/nodes/shader/nodes/node_shader_tex_wave.cc
133

This doesn't make sense because r_color is not using the *_if_required method above.
Also, you are writing to r_fac below, even though it may be empty.

145

Make use of switch statements.

176

Missing { }

This revision now requires changes to proceed.Oct 19 2021, 2:48 PM
Charlie Jolly (charlie) marked 3 inline comments as done.Oct 19 2021, 4:01 PM
Charlie Jolly (charlie) added inline comments.
source/blender/nodes/shader/nodes/node_shader_tex_wave.cc
133

I had these the wrong way around.

Charlie Jolly (charlie) updated this revision to Diff 43583.Oct 19 2021, 4:01 PM
Charlie Jolly (charlie) marked an inline comment as done.

Address comments

Harbormaster completed remote builds in B18009: Diff 43583.Oct 19 2021, 4:02 PM
Charlie Jolly (charlie) added a comment.Oct 19 2021, 4:02 PM

gn_wave_validation.blend916 KBDownload

Jacques Lucke (JacquesLucke) accepted this revision.Oct 19 2021, 6:18 PM
Jacques Lucke (JacquesLucke) added inline comments.
source/blender/nodes/shader/nodes/node_shader_tex_wave.cc
204

Check for !r_color.is_empty() directly.

This revision is now accepted and ready to land.Oct 19 2021, 6:18 PM
Charlie Jolly (charlie) marked an inline comment as done.Oct 19 2021, 6:44 PM
Charlie Jolly (charlie) updated this revision to Diff 43597.Oct 19 2021, 6:45 PM

Address comments

Harbormaster completed remote builds in B18015: Diff 43597.Oct 19 2021, 6:45 PM
Closed by commit rB67dbb42236da: Geometry Nodes: Add Wave texture node (authored by Charlie Jolly (charlie)). · Explain WhyOct 19 2021, 6:46 PM
This revision was automatically updated to reflect the committed changes.
Charlie Jolly (charlie) added a commit: rB67dbb42236da: Geometry Nodes: Add Wave texture node.

Revision Contents
Changeset List

PathSize
release/
scripts/
startup/
1 line
source/
blender/
blenlib/
5 lines
nodes/
shader/
nodes/
143 lines

Diff 43598

View Options

release/scripts/startup/nodeitems_builtins.py

Loading...
View Options

source/blender/blenlib/BLI_float3.hh

Loading...
View Options

source/blender/nodes/shader/nodes/node_shader_tex_wave.cc

Loading...