diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-08-10 04:52:57 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-08-10 04:52:57 +0400 |
| commit | 30f279be26b70dc389f8300e8f5fb95d69c4b723 (patch) | |
| tree | 9b8ed6324d3df11b3a22af05c66aaf660ebf5bbf /intern/cycles/kernel/svm/svm_wave.h | |
| parent | 743a7a4a4b2b6999b911704b6367962fc365474a (diff) | |
Code cleanup / Cycles:
* Remove code for the unused Wave texture variations.
We have quite some unused code in the texture area, I guess it doesn't harm to clean a bit up here.
We can always get the code back from SVN if we need something.
Diffstat (limited to 'intern/cycles/kernel/svm/svm_wave.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_wave.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/intern/cycles/kernel/svm/svm_wave.h b/intern/cycles/kernel/svm/svm_wave.h index d2d808e4063..33c1694283d 100644 --- a/intern/cycles/kernel/svm/svm_wave.h +++ b/intern/cycles/kernel/svm/svm_wave.h @@ -22,21 +22,19 @@ CCL_NAMESPACE_BEGIN __device_noinline float svm_wave(NodeWaveType type, float3 p, float scale, float detail, float distortion, float dscale) { - float w, n; + float n; p *= scale; if(type == NODE_WAVE_BANDS) n = (p.x + p.y + p.z) * 10.0f; - else /* if(type == NODE_WAVE_RINGS) */ + else /* NODE_WAVE_RINGS */ n = len(p) * 20.0f; if(distortion != 0.0f) n += distortion * noise_turbulence(p*dscale, NODE_NOISE_PERLIN, detail, 0); - w = noise_wave(NODE_WAVE_SINE, n); - - return w; + return 0.5f + 0.5f * sinf(n); } __device void svm_node_tex_wave(KernelGlobals *kg, ShaderData *sd, float *stack, uint4 node, int *offset) |