Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Code cleanup / Cycles:

Browse Source 
* 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.
This commit is contained in:
Thomas Dinges
2013-08-10 00:52:57 +00:00
parent 743a7a4a4b
commit 30f279be26
5 changed files with 4 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/kernel/svm/svm_wave.h
View File

@@ -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)