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

Cycles:

Browse Source 
* Style cleanup for M_PI constants.
* Move Wireframe node into __EXTRA_NODES__ define
This commit is contained in:
Thomas Dinges 2013-06-14 14:29:00 +00:00
parent cc3476b07e
commit 88b30ccb8c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/kernel/kernel_montecarlo.h
View File

@ -39,7 +39,7 @@ CCL_NAMESPACE_BEGIN
/// [-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);

2
intern/cycles/kernel/kernel_projection.h
View File

@ -57,7 +57,7 @@ __device float3 spherical_to_direction(float theta, float phi)
__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);

2
intern/cycles/kernel/svm/svm.h
View File

@ -359,10 +359,10 @@ __device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderT
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;

4
intern/cycles/kernel/svm/svm_texture.h
View File

@ -185,7 +185,7 @@ __device float noise_wave(NodeWaveBasis wave, float a)
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 @@ __device float noise_wave(NodeWaveBasis wave, float a)
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)));