Page MenuHome
Differential D1699

Cycles: Add Saw option to the wave texture
ClosedPublic
Actions

Authored by Lukas Stockner (lukasstockner97) on Dec 29 2015, 3:15 PM.

Details

Reviewers
Thomas Dinges (dingto)
Sergey Sharybin (sergey)
Commits
rC55d7003ecffe: Add Saw option to the wave texture
rBS5c682a901b2a: Cycles: Add Saw option to the wave texture
rB5c682a901b2a: Cycles: Add Saw option to the wave texture
Summary

This commit adds "Bands Saw" and "Rings Saw" to the options for the Wave texture node in Cycles, behaving similar to the Saw option in BI textures.
Requested by @claas kuhnen (cekuhnen) on BA.

Diff Detail

Repository
rB Blender
Branch
wave_saw

Event Timeline

Lukas Stockner (lukasstockner97) updated this revision to Diff 5671.Dec 29 2015, 3:15 PM
Lukas Stockner (lukasstockner97) retitled this revision from to Cycles: Add Saw option to the wave texture.
Lukas Stockner (lukasstockner97) added reviewers: Thomas Dinges (dingto), Sergey Sharybin (sergey).
Lukas Stockner (lukasstockner97) updated this object.
Lukas Stockner (lukasstockner97) added a subscriber: claas kuhnen (cekuhnen).
Sergey Sharybin (sergey) requested changes to this revision.Dec 29 2015, 3:38 PM
Sergey Sharybin (sergey) edited edge metadata.

While the underlying code might be kept as-is, in the interface it makes more sense to have separate menus for the shape and falloff.

intern/cycles/kernel/shaders/node_wave_texture.osl
37
if (...) {
  return ...
}
else {
  /* Saw profile wave */
  return ...
}
intern/cycles/kernel/svm/svm_wave.h
36

Same as above.

This revision now requires changes to proceed.Dec 29 2015, 3:38 PM
Lukas Stockner (lukasstockner97) updated this revision to Diff 5674.Dec 29 2015, 5:24 PM
Lukas Stockner (lukasstockner97) edited edge metadata.

Profile is now a separate enum.

Thomas Dinges (dingto) requested changes to this revision.Dec 29 2015, 5:51 PM
Thomas Dinges (dingto) edited edge metadata.

Please always rebase, before submitting patches. This misses the new equals() function for nodes.

This revision now requires changes to proceed.Dec 29 2015, 5:51 PM
Lukas Stockner (lukasstockner97) updated this revision to Diff 5678.Dec 29 2015, 8:21 PM
Lukas Stockner (lukasstockner97) edited edge metadata.

Okay, it's rebased now.

Derek Barker (lordodin) awarded a token.Dec 29 2015, 10:13 PM
Derek Barker (lordodin) rescinded a token.
Thomas Dinges (dingto) accepted this revision.Dec 29 2015, 11:49 PM
Thomas Dinges (dingto) edited edge metadata.

LGTM apart from these two little things.

intern/cycles/kernel/shaders/node_wave_texture.osl
40

Use M_2PI

intern/cycles/kernel/svm/svm_wave.h
36

This differs from the OSL implementation? They should match exactly.

Brendon Murphy (meta-androcto) awarded a token.Dec 29 2015, 11:58 PM
Lukas Stockner (lukasstockner97) updated this revision to Diff 5680.Dec 30 2015, 5:10 AM
Lukas Stockner (lukasstockner97) edited edge metadata.

Okay, now OSL and SVM code are written more similar (reduces confusion) and the braces should be correct.

Thomas Dinges (dingto) accepted this revision.Dec 30 2015, 12:04 PM
Thomas Dinges (dingto) edited edge metadata.
Sergey Sharybin (sergey) accepted this revision.Dec 30 2015, 2:56 PM
Sergey Sharybin (sergey) edited edge metadata.

LGTM.

This revision is now accepted and ready to land.Dec 30 2015, 2:56 PM
Closed by commit rB5c682a901b2a: Cycles: Add Saw option to the wave texture (authored by Lukas Stockner (lukasstockner97)). · Explain WhyJan 1 2016, 11:35 PM
This revision was automatically updated to reflect the committed changes.
Hakan Tunc (Tunge) awarded a token.Jan 2 2016, 12:51 PM

Revision Contents
Changeset List

PathSize
intern/
cycles/
kernel/
shaders/
11 lines
svm/
4 lines
13 lines
render/
2 lines
source/
blender/
makesdna/
2 lines
makesrna/
intern/
6 lines

Diff 5671

View Options

intern/cycles/kernel/shaders/node_wave_texture.osl

Loading...
View Options

intern/cycles/kernel/svm/svm_types.h

Loading...
View Options

intern/cycles/kernel/svm/svm_wave.h

Loading...
View Options

intern/cycles/render/nodes.cpp

Loading...
View Options

source/blender/makesdna/DNA_node_types.h

Loading...
View Options

source/blender/makesrna/intern/rna_nodetree.c

Loading...