diff options
author | Thomas Dinges <blender@dingto.org> | 2013-05-21 17:22:11 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2013-05-21 17:22:11 +0400 |
commit | 6b7d2ed8b67b9d4e44cb89802891799879212897 (patch) | |
tree | e52bd3c8f0217925ca1757940df8263a735e61f9 /intern/cycles/kernel | |
parent | 54bb3077e1709e37e30bda9e15003c10176140e0 (diff) |
Code cleanup / Cycles:
* Use M_2PI_F in more places and do multiplication instead of division in gradient texture.
Diffstat (limited to 'intern/cycles/kernel')
-rw-r--r-- | intern/cycles/kernel/kernel_montecarlo.h | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/shaders/node_gradient_texture.osl | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/svm_gradient.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_montecarlo.h b/intern/cycles/kernel/kernel_montecarlo.h index 707c769f0cd..2ae95084162 100644 --- a/intern/cycles/kernel/kernel_montecarlo.h +++ b/intern/cycles/kernel/kernel_montecarlo.h @@ -125,7 +125,7 @@ __device float3 sample_uniform_sphere(float u1, float u2) { 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); diff --git a/intern/cycles/kernel/shaders/node_gradient_texture.osl b/intern/cycles/kernel/shaders/node_gradient_texture.osl index 9ae281ff623..1aca31c17ef 100644 --- a/intern/cycles/kernel/shaders/node_gradient_texture.osl +++ b/intern/cycles/kernel/shaders/node_gradient_texture.osl @@ -45,10 +45,10 @@ float gradient(point p, string type) 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); diff --git a/intern/cycles/kernel/svm/svm_gradient.h b/intern/cycles/kernel/svm/svm_gradient.h index 95c662ac28b..9329647aa25 100644 --- a/intern/cycles/kernel/svm/svm_gradient.h +++ b/intern/cycles/kernel/svm/svm_gradient.h @@ -42,7 +42,7 @@ __device float svm_gradient(float3 p, NodeGradientType type) 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; |