[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47359] trunk/blender/intern/cycles/kernel /osl/nodes: Cycles / OSL Textures:

[Thomas Dinges]

Revision: 47359
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47359
Author:   dingto
Date:     2012-06-02 22:57:26 +0000 (Sat, 02 Jun 2012)
Log Message:
-----------
Cycles / OSL Textures:
* More fixes, replaced all remaining size variables with scale ones.
* Remove nonzero check in OSL textures, not needed anymore, was there to prevent division by zero for the size variable. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
    trunk/blender/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
    trunk/blender/intern/cycles/kernel/osl/nodes/node_voronoi_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-06-02 22:47:33 UTC (rev 47358)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl	2012-06-02 22:57:26 UTC (rev 47359)
@@ -193,16 +193,15 @@
 	float Offset = 0.0,
 	float Intensity = 1.0,
 	float Gain = 1.0,
-	float Size = 0.25,
+	float Scale = 5.0,
 	point Vector = P,
 	output float Fac = 0.0)
 {
 	float dimension = max(Dimension, 0.0);
 	float octaves = max(Octaves, 0.0);
 	float lacunarity = max(Lacunarity, 1e-5);
-	float size = nonzero(Size, 1e-5);
 
-	point p = Vector/size;
+	point p = Vector*Scale;
 
 	if(Type == "Multifractal")
 		Fac = Intensity*noise_musgrave_multi_fractal(p, Basis, dimension, lacunarity, octaves);

Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_noise_texture.osl	2012-06-02 22:47:33 UTC (rev 47358)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_noise_texture.osl	2012-06-02 22:57:26 UTC (rev 47359)
@@ -46,7 +46,7 @@
 	*/
 }
 
-shader node_distorted_noise_texture(
+shader node_noise_texture(
 	string Basis = "Perlin",
 	float Distortion = 0.0,
 	float Scale = 5.0,
@@ -54,7 +54,6 @@
 	point Vector = P,
 	output float Fac = 0.0)
 {
-	float scale = nonzero(Scale, 1e-5);
-	Fac = noise(Vector*scale, Basis, Distortion, Detail);
+	Fac = noise(Vector*Scale, Basis, Distortion, Detail);
 }
 

Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl	2012-06-02 22:47:33 UTC (rev 47358)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl	2012-06-02 22:57:26 UTC (rev 47359)
@@ -30,13 +30,12 @@
 	float Weight4 = 0.0,
 	float Exponent = 2.5,
 	float Intensity = 1.0,
-	float Size = 0.25,
+	float Scale = 5.0,
 	point Vector = P,
 	output float Fac = 0.0,
 	output color Color = color(0.0, 0.0, 0.0))
 {
 	float exponent = max(Exponent, 1e-5);
-	float size = nonzero(Size, 1e-5);
 
 	float aw1 = fabs(Weight1);
 	float aw2 = fabs(Weight2);
@@ -51,7 +50,7 @@
 	float da[4];
 	point pa[4];
 
-	voronoi(Vector/size, DistanceMetric, exponent, da, pa);
+	voronoi(Vector*Scale, DistanceMetric, exponent, da, pa);
 
 	/* Scalar output */
 	Fac = sc * fabs(Weight1*da[0] + Weight2*da[1] + Weight3*da[2] + Weight4*da[3]);

Modified: trunk/blender/intern/cycles/kernel/osl/nodes/node_wave_texture.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_wave_texture.osl	2012-06-02 22:47:33 UTC (rev 47358)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_wave_texture.osl	2012-06-02 22:57:26 UTC (rev 47359)
@@ -54,7 +54,6 @@
 	point Vector = P,
 	output float Fac = 0.0)
 {
-	float scale = nonzero(Scale, 1e-5);
-	Fac = wave(Vector, scale, Type, detail, distortion, dscale);
+	Fac = wave(Vector, Scale, Type, detail, distortion, dscale);
 }