griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles / OSL:

Browse Source 
* Avoid some conditional branches for the Noise texture and return immediately.
This commit is contained in:
Thomas Dinges
2013-03-10 00:11:52 +00:00
parent 347e2b6cb0
commit 5ac628fb47
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
intern/cycles/kernel/shaders/node_texture.h
View File

@@ -172,26 +172,24 @@ float safe_noise(point p, int type)
float noise_basis(point p, string basis)
{
float result = 0.0;
if (basis == "Perlin")
result = safe_noise(p, 1);
return safe_noise(p, 1);
if (basis == "Voronoi F1")
result = voronoi_F1S(p);
return voronoi_F1S(p);
if (basis == "Voronoi F2")
result = voronoi_F2S(p);
return voronoi_F2S(p);
if (basis == "Voronoi F3")
result = voronoi_F3S(p);
return voronoi_F3S(p);
if (basis == "Voronoi F4")
result = voronoi_F4S(p);
return voronoi_F4S(p);
if (basis == "Voronoi F2-F1")
result = voronoi_F1F2S(p);
return voronoi_F1F2S(p);
if (basis == "Voronoi Crackle")
result = voronoi_CrS(p);
return voronoi_CrS(p);
if (basis == "Cell Noise")
result = cellnoise(p);
return cellnoise(p);
return result;
return 0.0;
}
/* Soft/Hard Noise */