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

Cycles: procedural texture nodes reorganization. This will break existing files

Browse Source 
using them, but rather do it now that I have the chance still. Highlights:

* Wood and Marble merged into a single Wave texture
* Clouds + Distorted Noise merged into new Noise node
* Blend renamed to Gradient
* Stucci removed, was mostly useful for old bump
* Noise removed, will come back later, didn't actually work yet
* Depth setting is now Detail socket, which accepts float values
* Scale socket instead of Size socket

http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures
This commit is contained in:
Brecht Van Lommel
2011-11-06 21:05:58 +00:00
parent 3bf96250cd
commit fb56dbc2af
42 changed files with 827 additions and 2242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
intern/cycles/kernel/svm/svm_texture.h
View File

@@ -213,14 +213,17 @@ __device float noise_wave(NodeWaveType wave, float a)
/* Turbulence */
__device_noinline float noise_turbulence(float3 p, NodeNoiseBasis basis, int octaves, int hard)
__device_noinline float noise_turbulence(float3 p, NodeNoiseBasis basis, float octaves, int hard)
{
float fscale = 1.0f;
float amp = 1.0f;
float sum = 0.0f;
int i;
int i, n;
for(i = 0; i <= octaves; i++) {
octaves = clamp(octaves, 0.0f, 16.0f);
n= (int)octaves;
for(i = 0; i <= n; i++) {
float t = noise_basis(fscale*p, basis);
if(hard)
@@ -231,9 +234,25 @@ __device_noinline float noise_turbulence(float3 p, NodeNoiseBasis basis, int oct
fscale *= 2.0f;
}
sum *= ((float)(1 << octaves)/(float)((1 << (octaves+1)) - 1));
float rmd = octaves - floor(octaves);
return sum;
if(rmd != 0.0f) {
float t = noise_basis(fscale*p, basis);
if(hard)
t = fabsf(2.0f*t - 1.0f);
float sum2 = sum + t*amp;
sum *= ((float)(1 << n)/(float)((1 << (n+1)) - 1));
sum2 *= ((float)(1 << (n+1))/(float)((1 << (n+2)) - 1));
return (1.0f - rmd)*sum + rmd*sum2;
}
else {
sum *= ((float)(1 << n)/(float)((1 << (n+1)) - 1));
return sum;
}
}
CCL_NAMESPACE_END