diff options
author | Thomas Dinges <blender@dingto.org> | 2013-06-10 04:01:52 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2013-06-10 04:01:52 +0400 |
commit | 0dfc5fc3421adc9f5a44f59128363c51efb7ba4a (patch) | |
tree | d255a64b33d0bbea40c49eea8fdcae8bf1dadbcc /intern/cycles/kernel/svm/svm_sky.h | |
parent | cf359f6c7f259bf669a144c9a455fe79780fc6ff (diff) |
Cycles / Code cleanup:
* Move hsv and xyz color functions into the dedicated util files (util_color.h and node_color.h).
* svm_lerp moved into util_math.h and renamed to lerp_interp, as it's used for the wavelength node now as well.
Diffstat (limited to 'intern/cycles/kernel/svm/svm_sky.h')
-rw-r--r-- | intern/cycles/kernel/svm/svm_sky.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/intern/cycles/kernel/svm/svm_sky.h b/intern/cycles/kernel/svm/svm_sky.h index eaba4d18365..8b4e35816d0 100644 --- a/intern/cycles/kernel/svm/svm_sky.h +++ b/intern/cycles/kernel/svm/svm_sky.h @@ -18,26 +18,6 @@ CCL_NAMESPACE_BEGIN -__device float3 xyY_to_xyz(float x, float y, float Y) -{ - float X, Z; - - if(y != 0.0f) X = (x / y) * Y; - else X = 0.0f; - - if(y != 0.0f && Y != 0.0f) Z = (1.0f - x - y) / y * Y; - else Z = 0.0f; - - return make_float3(X, Y, Z); -} - -__device float3 xyz_to_rgb(float x, float y, float z) -{ - return make_float3(3.240479f * x + -1.537150f * y + -0.498535f * z, - -0.969256f * x + 1.875991f * y + 0.041556f * z, - 0.055648f * x + -0.204043f * y + 1.057311f * z); -} - /* * "A Practical Analytic Model for Daylight" * A. J. Preetham, Peter Shirley, Brian Smits |