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_texture.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_texture.h')
-rw-r--r-- | intern/cycles/kernel/svm/svm_texture.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/intern/cycles/kernel/svm/svm_texture.h b/intern/cycles/kernel/svm/svm_texture.h index 3347b623506..f735eb8acbe 100644 --- a/intern/cycles/kernel/svm/svm_texture.h +++ b/intern/cycles/kernel/svm/svm_texture.h @@ -177,31 +177,6 @@ __device float noise_basis_hard(float3 p, NodeNoiseBasis basis, int hard) return (hard)? fabsf(2.0f*t - 1.0f): t; } -/* Waves */ - -__device float noise_wave(NodeWaveBasis wave, float a) -{ - if(wave == NODE_WAVE_SINE) { - return 0.5f + 0.5f * sinf(a); - } - else if(wave == NODE_WAVE_SAW) { - float b = M_2PI_F; - int n = float_to_int(a / b); - a -= n*b; - if(a < 0.0f) a += b; - - return a / b; - } - else if(wave == NODE_WAVE_TRI) { - float b = M_2PI_F; - float rmax = 1.0f; - - return rmax - 2.0f*fabsf(floorf((a*(1.0f/b))+0.5f) - (a*(1.0f/b))); - } - - return 0.0f; -} - /* Turbulence */ __device_noinline float noise_turbulence(float3 p, NodeNoiseBasis basis, float octaves, int hard) |