[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56945] trunk/blender/intern/cycles/kernel : Code cleanup / Cycles:

[Thomas Dinges]

Revision: 56945
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56945
Author:   dingto
Date:     2013-05-21 13:22:11 +0000 (Tue, 21 May 2013)
Log Message:
-----------
Code cleanup / Cycles:
* Use M_2PI_F in more places and do multiplication instead of division in gradient texture.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_montecarlo.h
    trunk/blender/intern/cycles/kernel/shaders/node_gradient_texture.osl
    trunk/blender/intern/cycles/kernel/svm/svm_gradient.h

Modified: trunk/blender/intern/cycles/kernel/kernel_montecarlo.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_montecarlo.h	2013-05-21 13:15:27 UTC (rev 56944)
+++ trunk/blender/intern/cycles/kernel/kernel_montecarlo.h	2013-05-21 13:22:11 UTC (rev 56945)
@@ -125,7 +125,7 @@
 {
 	float z = 1.0f - 2.0f*u1;
 	float r = sqrtf(fmaxf(0.0f, 1.0f - z*z));
-	float phi = 2.0f*M_PI_F*u2;
+	float phi = M_2PI_F*u2;
 	float x = r*cosf(phi);
 	float y = r*sinf(phi);
 

Modified: trunk/blender/intern/cycles/kernel/shaders/node_gradient_texture.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_gradient_texture.osl	2013-05-21 13:15:27 UTC (rev 56944)
+++ trunk/blender/intern/cycles/kernel/shaders/node_gradient_texture.osl	2013-05-21 13:22:11 UTC (rev 56945)
@@ -45,10 +45,10 @@
 		result = (3.0 * t - 2.0 * t * r);
 	}
 	else if (type == "Diagonal") {
-		result = (x + y) / 2.0;
+		result = (x + y) * 0.5;
 	}
 	else if (type == "Radial") {
-		result = atan2(y, x) / (2.0 * M_PI) + 0.5;
+		result = atan2(y, x) / M_2PI + 0.5;
 	}
 	else {
 		float r = max(1.0 - sqrt(x * x + y * y + z * z), 0.0);

Modified: trunk/blender/intern/cycles/kernel/svm/svm_gradient.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_gradient.h	2013-05-21 13:15:27 UTC (rev 56944)
+++ trunk/blender/intern/cycles/kernel/svm/svm_gradient.h	2013-05-21 13:22:11 UTC (rev 56945)
@@ -42,7 +42,7 @@
 		return (3.0f*t - 2.0f*t*r);
 	}
 	else if(type == NODE_BLEND_DIAGONAL) {
-		return (x + y)/2.0f;
+		return (x + y) * 0.5f;
 	}
 	else if(type == NODE_BLEND_RADIAL) {
 		return atan2f(y, x) / M_2PI_F + 0.5f;