sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles / OSL:

Browse Source 
* Fix for r53689, there are two noise types, signed and unsigned.
Caused Musgrave Texture to render differently compared to SVM backend.
This commit is contained in:
Thomas Dinges 2013-02-04 11:23:40 +00:00
parent b2f6c49830
commit e3784a27d6
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
intern/cycles/kernel/shaders/node_musgrave_texture.osl
View File

@ -37,14 +37,14 @@ float noise_musgrave_fBm(point p, string basis, float H, float lacunarity, float
int i; int i;
for (i = 0; i < (int)octaves; i++) { for (i = 0; i < (int)octaves; i++) {
value += safe_noise(p) * pwr; value += safe_noise(p, 0) * pwr;
pwr *= pwHL; pwr *= pwHL;
p *= lacunarity; p *= lacunarity;
} }
rmd = octaves - floor(octaves); rmd = octaves - floor(octaves);
if (rmd != 0.0) if (rmd != 0.0)
value += rmd * safe_noise(p) * pwr; value += rmd * safe_noise(p, 0) * pwr;
return value; return value;
} }
@ -65,14 +65,14 @@ float noise_musgrave_multi_fractal(point p, string basis, float H, float lacunar
int i; int i;
for (i = 0; i < (int)octaves; i++) { for (i = 0; i < (int)octaves; i++) {
value *= (pwr * safe_noise(p) + 1.0); value *= (pwr * safe_noise(p, 0) + 1.0);
pwr *= pwHL; pwr *= pwHL;
p *= lacunarity; p *= lacunarity;
} }
rmd = octaves - floor(octaves); rmd = octaves - floor(octaves);
if (rmd != 0.0) if (rmd != 0.0)
value *= (rmd * pwr * safe_noise(p) + 1.0); /* correct? */ value *= (rmd * pwr * safe_noise(p, 0) + 1.0); /* correct? */
return value; return value;
} }
@ -93,11 +93,11 @@ float noise_musgrave_hetero_terrain(point p, string basis, float H, float lacuna
int i; int i;
/* first unscaled octave of function; later octaves are scaled */ /* first unscaled octave of function; later octaves are scaled */
value = offset + safe_noise(p); value = offset + safe_noise(p, 0);
p *= lacunarity; p *= lacunarity;
for (i = 1; i < (int)octaves; i++) { for (i = 1; i < (int)octaves; i++) {
increment = (safe_noise(p) + offset) * pwr * value; increment = (safe_noise(p, 0) + offset) * pwr * value;
value += increment; value += increment;
pwr *= pwHL; pwr *= pwHL;
p *= lacunarity; p *= lacunarity;
@ -105,7 +105,7 @@ float noise_musgrave_hetero_terrain(point p, string basis, float H, float lacuna
rmd = octaves - floor(octaves); rmd = octaves - floor(octaves);
if (rmd != 0.0) { if (rmd != 0.0) {
increment = (safe_noise(p) + offset) * pwr * value; increment = (safe_noise(p, 0) + offset) * pwr * value;
value += rmd * increment; value += rmd * increment;
} }
@ -128,7 +128,7 @@ float noise_musgrave_hybrid_multi_fractal(point p, string basis, float H,
float pwr = pwHL; float pwr = pwHL;
int i; int i;
result = safe_noise(p) + offset; result = safe_noise(p, 0) + offset;
weight = gain * result; weight = gain * result;
p *= lacunarity; p *= lacunarity;
@ -136,7 +136,7 @@ float noise_musgrave_hybrid_multi_fractal(point p, string basis, float H,
if (weight > 1.0) if (weight > 1.0)
weight = 1.0; weight = 1.0;
signal = (safe_noise(p) + offset) * pwr; signal = (safe_noise(p, 0) + offset) * pwr;
pwr *= pwHL; pwr *= pwHL;
result += weight * signal; result += weight * signal;
weight *= gain * signal; weight *= gain * signal;
@ -145,7 +145,7 @@ float noise_musgrave_hybrid_multi_fractal(point p, string basis, float H,
rmd = octaves - floor(octaves); rmd = octaves - floor(octaves);
if (rmd != 0.0) if (rmd != 0.0)
result += rmd * ((safe_noise(p) + offset) * pwr); result += rmd * ((safe_noise(p, 0) + offset) * pwr);
return result; return result;
} }
@ -166,7 +166,7 @@ float noise_musgrave_ridged_multi_fractal(point p, string basis, float H,
float pwr = pwHL; float pwr = pwHL;
int i; int i;
signal = offset - fabs(safe_noise(p)); signal = offset - fabs(safe_noise(p, 0));
signal *= signal; signal *= signal;
result = signal; result = signal;
weight = 1.0; weight = 1.0;
@ -174,7 +174,7 @@ float noise_musgrave_ridged_multi_fractal(point p, string basis, float H,
for (i = 1; i < (int)octaves; i++) { for (i = 1; i < (int)octaves; i++) {
p *= lacunarity; p *= lacunarity;
weight = clamp(signal * gain, 0.0, 1.0); weight = clamp(signal * gain, 0.0, 1.0);
signal = offset - fabs(safe_noise(p)); signal = offset - fabs(safe_noise(p, 0));
signal *= signal; signal *= signal;
signal *= weight; signal *= weight;
result += signal * pwr; result += signal * pwr;

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

@ -151,9 +151,17 @@ float voronoi_CrS(point p) { return 2.0 * voronoi_Cr(p) - 1.0; }
/* Noise Bases */ /* Noise Bases */
float safe_noise(point p) float safe_noise(point p, int type)
{ {
float f = noise(p); float f = 0.0;
/* Perlin noise in range -1..1 */
if (type == 0)
f = noise("perlin", p);
/* Perlin noise in range 0..1 */
else
f = noise(p);
/* can happen for big coordinates, things even out to 0.5 then anyway */ /* can happen for big coordinates, things even out to 0.5 then anyway */
if(!isfinite(f)) if(!isfinite(f))
@ -167,7 +175,7 @@ float noise_basis(point p, string basis)
float result = 0.0; float result = 0.0;
if (basis == "Perlin") if (basis == "Perlin")
result = safe_noise(p); /* returns perlin noise in range 0..1 */ result = safe_noise(p, 1);
if (basis == "Voronoi F1") if (basis == "Voronoi F1")
result = voronoi_F1S(p); result = voronoi_F1S(p);
if (basis == "Voronoi F2") if (basis == "Voronoi F2")