Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles / Code cleanup:

Browse Source 
* 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.
This commit is contained in:
Thomas Dinges
2013-06-10 00:01:52 +00:00
parent cf359f6c7f
commit 0dfc5fc342
8 changed files with 129 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
intern/cycles/kernel/shaders/node_color.h
View File

@@ -58,6 +58,26 @@ color color_unpremultiply(color c, float alpha)
/* Color Operations */
color xyY_to_xyz(float x, float y, float Y)
{
float X, Z;
if (y != 0.0) X = (x / y) * Y;
else X = 0.0;
if (y != 0.0 && Y != 0.0) Z = ((1.0 - x - y) / y) * Y;
else Z = 0.0;
return color(X, Y, Z);
}
color xyz_to_rgb(float x, float y, float z)
{
return color( 3.240479 * x + -1.537150 * y + -0.498535 * z,
-0.969256 * x + 1.875991 * y + 0.041556 * z,
0.055648 * x + -0.204043 * y + 1.057311 * z);
}
color rgb_to_hsv(color rgb)
{
float cmax, cmin, h, s, v, cdelta;

21
intern/cycles/kernel/shaders/node_sky_texture.osl
View File

@@ -17,6 +17,7 @@
*/
#include "stdosl.h"
#include "node_color.h"
struct KernelSunSky {
/* sun direction in spherical and cartesian */
@@ -28,26 +29,6 @@ struct KernelSunSky {
float perez_Y[5], perez_x[5], perez_y[5];
};
color xyY_to_xyz(float x, float y, float Y)
{
float X, Z;
if (y != 0.0) X = (x / y) * Y;
else X = 0.0;
if (y != 0.0 && Y != 0.0) Z = ((1.0 - x - y) / y) * Y;
else Z = 0.0;
return color(X, Y, Z);
}
color xyz_to_rgb(float x, float y, float z)
{
return color( 3.240479 * x + -1.537150 * y + -0.498535 * z,
-0.969256 * x + 1.875991 * y + 0.041556 * z,
0.055648 * x + -0.204043 * y + 1.057311 * z);
}
float sky_angle_between(float thetav, float phiv, float theta, float phi)
{
float cospsi = sin(thetav) * sin(theta) * cos(phi - phiv) + cos(thetav) * cos(theta);