[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50388] trunk/blender/intern/cycles/kernel /osl/nodes: OSL:
Thomas Dinges
blender at dingto.org
Tue Sep 4 18:00:13 CEST 2012
Revision: 50388
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50388
Author: dingto
Date: 2012-09-04 16:00:12 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
OSL:
* WIP commit of fixes for musgrave and wave.
Modified Paths:
--------------
trunk/blender/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
trunk/blender/intern/cycles/kernel/osl/nodes/node_wave_texture.osl
Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl 2012-09-04 13:48:24 UTC (rev 50387)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl 2012-09-04 16:00:12 UTC (rev 50388)
@@ -186,32 +186,35 @@
shader node_musgrave_texture(
string Type = "fBM",
- string Basis = "Perlin",
float Dimension = 2.0,
float Lacunarity = 1.0,
- float Octaves = 2.0,
+ float Detail = 2.0,
float Offset = 0.0,
- float Intensity = 1.0,
float Gain = 1.0,
float Scale = 5.0,
point Vector = P,
- output float Fac = 0.0)
+ output float Fac = 0.0,
+ output color Color = color(0.0, 0.0, 0.0))
{
- float dimension = max(Dimension, 0.0);
- float octaves = max(Octaves, 0.0);
+ float dimension = max(Dimension, 1e-5);
+ float octaves = clamp(Detail, 0.0, 16.0);
float lacunarity = max(Lacunarity, 1e-5);
+ string Basis = "Perlin"
+ float intensity = 1.0;
point p = Vector*Scale;
if(Type == "Multifractal")
- Fac = Intensity*noise_musgrave_multi_fractal(p, Basis, dimension, lacunarity, octaves);
+ Fac = intensity*noise_musgrave_multi_fractal(p, Basis, dimension, lacunarity, octaves);
else if(Type == "fBM")
- Fac = Intensity*noise_musgrave_fBm(p, Basis, dimension, lacunarity, octaves);
+ Fac = intensity*noise_musgrave_fBm(p, Basis, dimension, lacunarity, octaves);
else if(Type == "Hybrid Multifractal")
- Fac = Intensity*noise_musgrave_hybrid_multi_fractal(p, Basis, dimension, lacunarity, octaves, Offset, Gain);
+ Fac = intensity*noise_musgrave_hybrid_multi_fractal(p, Basis, dimension, lacunarity, octaves, Offset, Gain);
else if(Type == "Ridged Multifractal")
- Fac = Intensity*noise_musgrave_ridged_multi_fractal(p, Basis, dimension, lacunarity, octaves, Offset, Gain);
+ Fac = intensity*noise_musgrave_ridged_multi_fractal(p, Basis, dimension, lacunarity, octaves, Offset, Gain);
else if(Type == "Hetero Terrain")
- Fac = Intensity*noise_musgrave_hetero_terrain(p, Basis, dimension, lacunarity, octaves, Offset);
+ Fac = intensity*noise_musgrave_hetero_terrain(p, Basis, dimension, lacunarity, octaves, Offset);
+
+ Color = color(Fac, Fac, Fac);
}
Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_wave_texture.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_wave_texture.osl 2012-09-04 13:48:24 UTC (rev 50387)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_wave_texture.osl 2012-09-04 16:00:12 UTC (rev 50388)
@@ -48,12 +48,14 @@
shader node_wave_texture(
string Type = "Bands",
float Scale = 5.0,
- float distortion = 0.0,
- float detail = 2.0,
+ float Distortion = 0.0,
+ float Detail = 2.0,
float dscale = 1.0,
point Vector = P,
- output float Fac = 0.0)
+ output float Fac = 0.0,
+ output color Color = color (0.0, 0.0, 0.0))
{
- Fac = wave(Vector, Scale, Type, detail, distortion, dscale);
+ Fac = wave(Vector, Scale, Type, Detail, Distortion, dscale);
+ Color = color(Fac, Fac, Fac);
}
More information about the Bf-blender-cvs
mailing list