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

[Thomas Dinges]

Revision: 57454
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57454
Author:   dingto
Date:     2013-06-14 14:29:00 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
Cycles:
* Style cleanup for M_PI constants.
* Move Wireframe node into __EXTRA_NODES__ define

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_montecarlo.h
    trunk/blender/intern/cycles/kernel/kernel_projection.h
    trunk/blender/intern/cycles/kernel/svm/svm.h
    trunk/blender/intern/cycles/kernel/svm/svm_texture.h

Modified: trunk/blender/intern/cycles/kernel/kernel_montecarlo.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_montecarlo.h	2013-06-14 13:56:00 UTC (rev 57453)
+++ trunk/blender/intern/cycles/kernel/kernel_montecarlo.h	2013-06-14 14:29:00 UTC (rev 57454)
@@ -39,7 +39,7 @@
 /// [-1,1] uniformly distributed over a unit sphere.
 __device void to_unit_disk(float *x, float *y)
 {
-	float phi = 2.0f * M_PI_F * (*x);
+	float phi = M_2PI_F * (*x);
 	float r = sqrtf(*y);
 
 	*x = r * cosf(phi);

Modified: trunk/blender/intern/cycles/kernel/kernel_projection.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_projection.h	2013-06-14 13:56:00 UTC (rev 57453)
+++ trunk/blender/intern/cycles/kernel/kernel_projection.h	2013-06-14 14:29:00 UTC (rev 57454)
@@ -57,7 +57,7 @@
 
 __device float2 direction_to_equirectangular(float3 dir)
 {
-	float u = -atan2f(dir.y, dir.x)/(2.0f*M_PI_F) + 0.5f;
+	float u = -atan2f(dir.y, dir.x)/(M_2PI_F) + 0.5f;
 	float v = atan2f(dir.z, hypotf(dir.x, dir.y))/M_PI_F + 0.5f;
 
 	return make_float2(u, v);

Modified: trunk/blender/intern/cycles/kernel/svm/svm.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm.h	2013-06-14 13:56:00 UTC (rev 57453)
+++ trunk/blender/intern/cycles/kernel/svm/svm.h	2013-06-14 14:29:00 UTC (rev 57454)
@@ -359,10 +359,10 @@
 			case NODE_LAYER_WEIGHT:
 				svm_node_layer_weight(sd, stack, node);
 				break;
+#ifdef __EXTRA_NODES__
 			case NODE_WIREFRAME:
 				svm_node_wireframe(kg, sd, stack, node.y, node.z, node.w);
 				break;
-#ifdef __EXTRA_NODES__
 			case NODE_WAVELENGTH:
 				svm_node_wavelength(sd, stack, node.y, node.z);
 				break;

Modified: trunk/blender/intern/cycles/kernel/svm/svm_texture.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_texture.h	2013-06-14 13:56:00 UTC (rev 57453)
+++ trunk/blender/intern/cycles/kernel/svm/svm_texture.h	2013-06-14 14:29:00 UTC (rev 57454)
@@ -185,7 +185,7 @@
 		return 0.5f + 0.5f * sinf(a);
 	}
 	else if(wave == NODE_WAVE_SAW) {
-		float b = 2.0f*M_PI_F;
+		float b = M_2PI_F;
 		int n = float_to_int(a / b);
 		a -= n*b;
 		if(a < 0.0f) a += b;
@@ -193,7 +193,7 @@
 		return a / b;
 	}
 	else if(wave == NODE_WAVE_TRI) {
-		float b = 2.0f*M_PI_F;
+		float b = M_2PI_F;
 		float rmax = 1.0f;
 
 		return rmax - 2.0f*fabsf(floorf((a*(1.0f/b))+0.5f) - (a*(1.0f/b)));