Fix Eevee blackbody wrong with non-default scene linear color space
* Port over new code tables from Cycles * Convert Rec.709 to scene linear for lookup table. * Move code for wavelength and blackbody to IMB so they can access the required transforms, which are not in blenlib. * Remove clamping from blackbody shader to bypass the texture read. Since it's variable now easiest to just always read from the texture than pass additional parameters. * Fold XYZ to RGB conversion into the wavelength table. Ref T68926
This commit is contained in:
Brecht Van Lommel
parent
a22ad7fbd3
commit
bdab538b30
|
|
@ -186,9 +186,6 @@ MINLINE void rgba_uchar_args_test_set(
|
|||
unsigned char col[4], unsigned char r, unsigned char g, unsigned char b, unsigned char a);
|
||||
MINLINE void cpack_cpy_3ub(unsigned char r_col[3], unsigned int pack);
|
||||
|
||||
void blackbody_temperature_to_rgb_table(float *r_table, int width, float min, float max);
|
||||
void wavelength_to_xyz_table(float *r_table, int width);
|
||||
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
|
|
|
|||
|
|
@ -597,158 +597,3 @@ void BLI_init_srgb_conversion(void)
|
|||
BLI_color_to_srgb_table[i] = (unsigned short)(b * 0x100);
|
||||
}
|
||||
}
|
||||
|
||||
/* ****************************** blackbody ******************************** */
|
||||
|
||||
/* Calculate color in range 800..12000 using an approximation
|
||||
* a/x+bx+c for R and G and ((at + b)t + c)t + d) for B
|
||||
* Max absolute error for RGB is (0.00095, 0.00077, 0.00057),
|
||||
* which is enough to get the same 8 bit/channel color.
|
||||
*/
|
||||
|
||||
static const float blackbody_table_r[6][3] = {
|
||||
{2.52432244e+03f, -1.06185848e-03f, 3.11067539e+00f},
|
||||
{3.37763626e+03f, -4.34581697e-04f, 1.64843306e+00f},
|
||||
{4.10671449e+03f, -8.61949938e-05f, 6.41423749e-01f},
|
||||
{4.66849800e+03f, 2.85655028e-05f, 1.29075375e-01f},
|
||||
{4.60124770e+03f, 2.89727618e-05f, 1.48001316e-01f},
|
||||
{3.78765709e+03f, 9.36026367e-06f, 3.98995841e-01f},
|
||||
};
|
||||
|
||||
static const float blackbody_table_g[6][3] = {
|
||||
{-7.50343014e+02f, 3.15679613e-04f, 4.73464526e-01f},
|
||||
{-1.00402363e+03f, 1.29189794e-04f, 9.08181524e-01f},
|
||||
{-1.22075471e+03f, 2.56245413e-05f, 1.20753416e+00f},
|
||||
{-1.42546105e+03f, -4.01730887e-05f, 1.44002695e+00f},
|
||||
{-1.18134453e+03f, -2.18913373e-05f, 1.30656109e+00f},
|
||||
{-5.00279505e+02f, -4.59745390e-06f, 1.09090465e+00f},
|
||||
};
|
||||
|
||||
static const float blackbody_table_b[6][4] = {
|
||||
{0.0f, 0.0f, 0.0f, 0.0f},
|
||||
{0.0f, 0.0f, 0.0f, 0.0f},
|
||||
{0.0f, 0.0f, 0.0f, 0.0f},
|
||||
{-2.02524603e-11f, 1.79435860e-07f, -2.60561875e-04f, -1.41761141e-02f},
|
||||
{-2.22463426e-13f, -1.55078698e-08f, 3.81675160e-04f, -7.30646033e-01f},
|
||||
{6.72595954e-13f, -2.73059993e-08f, 4.24068546e-04f, -7.52204323e-01f},
|
||||
};
|
||||
|
||||
static void blackbody_temperature_to_rgb(float rgb[3], float t)
|
||||
{
|
||||
if (t >= 12000.0f) {
|
||||
rgb[0] = 0.826270103f;
|
||||
rgb[1] = 0.994478524f;
|
||||
rgb[2] = 1.56626022f;
|
||||
}
|
||||
else if (t < 965.0f) {
|
||||
rgb[0] = 4.70366907f;
|
||||
rgb[1] = 0.0f;
|
||||
rgb[2] = 0.0f;
|
||||
}
|
||||
else {
|
||||
int i = (t >= 6365.0f) ? 5 :
|
||||
(t >= 3315.0f) ? 4 :
|
||||
(t >= 1902.0f) ? 3 :
|
||||
(t >= 1449.0f) ? 2 :
|
||||
(t >= 1167.0f) ? 1 :
|
||||
0;
|
||||
|
||||
const float *r = blackbody_table_r[i];
|
||||
const float *g = blackbody_table_g[i];
|
||||
const float *b = blackbody_table_b[i];
|
||||
|
||||
const float t_inv = 1.0f / t;
|
||||
rgb[0] = r[0] * t_inv + r[1] * t + r[2];
|
||||
rgb[1] = g[0] * t_inv + g[1] * t + g[2];
|
||||
rgb[2] = ((b[0] * t + b[1]) * t + b[2]) * t + b[3];
|
||||
}
|
||||
}
|
||||
|
||||
void blackbody_temperature_to_rgb_table(float *r_table, int width, float min, float max)
|
||||
{
|
||||
for (int i = 0; i < width; i++) {
|
||||
float temperature = min + (max - min) / (float)width * (float)i;
|
||||
|
||||
float rgb[3];
|
||||
blackbody_temperature_to_rgb(rgb, temperature);
|
||||
|
||||
copy_v3_v3(&r_table[i * 4], rgb);
|
||||
r_table[i * 4 + 3] = 0.0f;
|
||||
}
|
||||
}
|
||||
|
||||
/* ****************************** wavelength ******************************** */
|
||||
/* Wavelength to RGB. */
|
||||
|
||||
/**
|
||||
* CIE color matching functions `xBar`, `yBar`, and `zBar` for
|
||||
* wavelengths from 380 through 780 nanometers, every 5 nanometers.
|
||||
*
|
||||
* For a wavelength lambda in this range:
|
||||
* \code{.txt}
|
||||
* cie_color_match[(lambda - 380) / 5][0] = xBar
|
||||
* cie_color_match[(lambda - 380) / 5][1] = yBar
|
||||
* cie_color_match[(lambda - 380) / 5][2] = zBar
|
||||
* \endcode
|
||||
*/
|
||||
|
||||
static float cie_colour_match[81][3] = {
|
||||
{0.0014f, 0.0000f, 0.0065f}, {0.0022f, 0.0001f, 0.0105f}, {0.0042f, 0.0001f, 0.0201f},
|
||||
{0.0076f, 0.0002f, 0.0362f}, {0.0143f, 0.0004f, 0.0679f}, {0.0232f, 0.0006f, 0.1102f},
|
||||
{0.0435f, 0.0012f, 0.2074f}, {0.0776f, 0.0022f, 0.3713f}, {0.1344f, 0.0040f, 0.6456f},
|
||||
{0.2148f, 0.0073f, 1.0391f}, {0.2839f, 0.0116f, 1.3856f}, {0.3285f, 0.0168f, 1.6230f},
|
||||
{0.3483f, 0.0230f, 1.7471f}, {0.3481f, 0.0298f, 1.7826f}, {0.3362f, 0.0380f, 1.7721f},
|
||||
{0.3187f, 0.0480f, 1.7441f}, {0.2908f, 0.0600f, 1.6692f}, {0.2511f, 0.0739f, 1.5281f},
|
||||
{0.1954f, 0.0910f, 1.2876f}, {0.1421f, 0.1126f, 1.0419f}, {0.0956f, 0.1390f, 0.8130f},
|
||||
{0.0580f, 0.1693f, 0.6162f}, {0.0320f, 0.2080f, 0.4652f}, {0.0147f, 0.2586f, 0.3533f},
|
||||
{0.0049f, 0.3230f, 0.2720f}, {0.0024f, 0.4073f, 0.2123f}, {0.0093f, 0.5030f, 0.1582f},
|
||||
{0.0291f, 0.6082f, 0.1117f}, {0.0633f, 0.7100f, 0.0782f}, {0.1096f, 0.7932f, 0.0573f},
|
||||
{0.1655f, 0.8620f, 0.0422f}, {0.2257f, 0.9149f, 0.0298f}, {0.2904f, 0.9540f, 0.0203f},
|
||||
{0.3597f, 0.9803f, 0.0134f}, {0.4334f, 0.9950f, 0.0087f}, {0.5121f, 1.0000f, 0.0057f},
|
||||
{0.5945f, 0.9950f, 0.0039f}, {0.6784f, 0.9786f, 0.0027f}, {0.7621f, 0.9520f, 0.0021f},
|
||||
{0.8425f, 0.9154f, 0.0018f}, {0.9163f, 0.8700f, 0.0017f}, {0.9786f, 0.8163f, 0.0014f},
|
||||
{1.0263f, 0.7570f, 0.0011f}, {1.0567f, 0.6949f, 0.0010f}, {1.0622f, 0.6310f, 0.0008f},
|
||||
{1.0456f, 0.5668f, 0.0006f}, {1.0026f, 0.5030f, 0.0003f}, {0.9384f, 0.4412f, 0.0002f},
|
||||
{0.8544f, 0.3810f, 0.0002f}, {0.7514f, 0.3210f, 0.0001f}, {0.6424f, 0.2650f, 0.0000f},
|
||||
{0.5419f, 0.2170f, 0.0000f}, {0.4479f, 0.1750f, 0.0000f}, {0.3608f, 0.1382f, 0.0000f},
|
||||
{0.2835f, 0.1070f, 0.0000f}, {0.2187f, 0.0816f, 0.0000f}, {0.1649f, 0.0610f, 0.0000f},
|
||||
{0.1212f, 0.0446f, 0.0000f}, {0.0874f, 0.0320f, 0.0000f}, {0.0636f, 0.0232f, 0.0000f},
|
||||
{0.0468f, 0.0170f, 0.0000f}, {0.0329f, 0.0119f, 0.0000f}, {0.0227f, 0.0082f, 0.0000f},
|
||||
{0.0158f, 0.0057f, 0.0000f}, {0.0114f, 0.0041f, 0.0000f}, {0.0081f, 0.0029f, 0.0000f},
|
||||
{0.0058f, 0.0021f, 0.0000f}, {0.0041f, 0.0015f, 0.0000f}, {0.0029f, 0.0010f, 0.0000f},
|
||||
{0.0020f, 0.0007f, 0.0000f}, {0.0014f, 0.0005f, 0.0000f}, {0.0010f, 0.0004f, 0.0000f},
|
||||
{0.0007f, 0.0002f, 0.0000f}, {0.0005f, 0.0002f, 0.0000f}, {0.0003f, 0.0001f, 0.0000f},
|
||||
{0.0002f, 0.0001f, 0.0000f}, {0.0002f, 0.0001f, 0.0000f}, {0.0001f, 0.0000f, 0.0000f},
|
||||
{0.0001f, 0.0000f, 0.0000f}, {0.0001f, 0.0000f, 0.0000f}, {0.0000f, 0.0000f, 0.0000f}};
|
||||
|
||||
static void wavelength_to_xyz(float xyz[3], float lambda_nm)
|
||||
{
|
||||
float ii = (lambda_nm - 380.0f) * (1.0f / 5.0f); /* Scaled 0..80. */
|
||||
int i = (int)ii;
|
||||
|
||||
if (i < 0 || i >= 80) {
|
||||
xyz[0] = 0.0f;
|
||||
xyz[1] = 0.0f;
|
||||
xyz[2] = 0.0f;
|
||||
}
|
||||
else {
|
||||
ii -= (float)i;
|
||||
const float *c = cie_colour_match[i];
|
||||
xyz[0] = c[0] + ii * (c[3] - c[0]);
|
||||
xyz[1] = c[1] + ii * (c[4] - c[1]);
|
||||
xyz[2] = c[2] + ii * (c[5] - c[2]);
|
||||
}
|
||||
}
|
||||
|
||||
void wavelength_to_xyz_table(float *r_table, int width)
|
||||
{
|
||||
for (int i = 0; i < width; i++) {
|
||||
float temperature = 380 + 400 / (float)width * (float)i;
|
||||
|
||||
float rgb[3];
|
||||
wavelength_to_xyz(rgb, temperature);
|
||||
|
||||
copy_v3_v3(&r_table[i * 4], rgb);
|
||||
r_table[i * 4 + 3] = 0.0f;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@
|
|||
|
||||
#include "BKE_colorband.h"
|
||||
|
||||
#include "IMB_colormanagement.h"
|
||||
|
||||
#include "GPU_texture.h"
|
||||
|
||||
#include "draw_manager.h"
|
||||
|
|
@ -52,7 +54,7 @@ static void create_flame_spectrum_texture(float *data)
|
|||
float *spec_pixels = (float *)MEM_mallocN(TFUNC_WIDTH * 4 * 16 * 16 * sizeof(float),
|
||||
"spec_pixels");
|
||||
|
||||
blackbody_temperature_to_rgb_table(data, TFUNC_WIDTH, 1500, 3000);
|
||||
IMB_colormanagement_blackbody_temperature_to_rgb_table(data, TFUNC_WIDTH, 1500, 3000);
|
||||
|
||||
for (int i = 0; i < 16; i++) {
|
||||
for (int j = 0; j < 16; j++) {
|
||||
|
|
|
|||
|
|
@ -1,13 +1,5 @@
|
|||
void node_blackbody(float temperature, sampler1DArray spectrummap, float layer, out vec4 color)
|
||||
{
|
||||
if (temperature >= 12000.0) {
|
||||
color = vec4(0.826270103, 0.994478524, 1.56626022, 1.0);
|
||||
}
|
||||
else if (temperature < 965.0) {
|
||||
color = vec4(4.70366907, 0.0, 0.0, 1.0);
|
||||
}
|
||||
else {
|
||||
float t = (temperature - 965.0) / (12000.0 - 965.0);
|
||||
color = vec4(texture(spectrummap, vec2(t, layer)).rgb, 1.0);
|
||||
}
|
||||
float t = (temperature - 800.0) / (12000.0 - 800.0);
|
||||
color = vec4(texture(spectrummap, vec2(t, layer)).rgb, 1.0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,7 @@
|
|||
void node_wavelength(float wavelength,
|
||||
sampler1DArray spectrummap,
|
||||
float layer,
|
||||
vec3 xyz_to_r,
|
||||
vec3 xyz_to_g,
|
||||
vec3 xyz_to_b,
|
||||
out vec4 color)
|
||||
void node_wavelength(float wavelength, sampler1DArray spectrummap, float layer, out vec4 color)
|
||||
{
|
||||
mat3 xyz_to_rgb = mat3(xyz_to_r, xyz_to_g, xyz_to_b);
|
||||
float t = (wavelength - 380.0) / (780.0 - 380.0);
|
||||
vec3 xyz = texture(spectrummap, vec2(t, layer)).rgb;
|
||||
vec3 rgb = xyz * xyz_to_rgb;
|
||||
vec3 rgb = texture(spectrummap, vec2(t, layer)).rgb;
|
||||
rgb *= 1.0 / 2.52; /* Empirical scale from lg to make all comps <= 1. */
|
||||
color = vec4(clamp(rgb, 0.0, 1.0), 1.0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -514,6 +514,18 @@ enum {
|
|||
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Rendering Tables
|
||||
* \{ */
|
||||
|
||||
void IMB_colormanagement_blackbody_temperature_to_rgb_table(float *r_table,
|
||||
const int width,
|
||||
const float min,
|
||||
const float max);
|
||||
void IMB_colormanagement_wavelength_to_rgb_table(float *r_table, const int width);
|
||||
|
||||
/** \} */
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -4082,3 +4082,170 @@ void IMB_colormanagement_finish_glsl_draw(void)
|
|||
}
|
||||
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Rendering Tables
|
||||
* \{ */
|
||||
|
||||
/* Calculate color in range 800..12000 using an approximation
|
||||
* a/x+bx+c for R and G and ((at + b)t + c)t + d) for B
|
||||
*
|
||||
* The result of this can be negative to support gamut wider than
|
||||
* than rec.709, just needs to be clamped. */
|
||||
|
||||
static const float blackbody_table_r[7][3] = {{1.61919106e+03f, -2.05010916e-03f, 5.02995757e+00f},
|
||||
{2.48845471e+03f, -1.11330907e-03f, 3.22621544e+00f},
|
||||
{3.34143193e+03f, -4.86551192e-04f, 1.76486769e+00f},
|
||||
{4.09461742e+03f, -1.27446582e-04f, 7.25731635e-01f},
|
||||
{4.67028036e+03f, 2.91258199e-05f, 1.26703442e-01f},
|
||||
{4.59509185e+03f, 2.87495649e-05f, 1.50345020e-01f},
|
||||
{3.78717450e+03f, 9.35907826e-06f, 3.99075871e-01f}};
|
||||
|
||||
static const float blackbody_table_g[7][3] = {
|
||||
{-4.88999748e+02f, 6.04330754e-04f, -7.55807526e-02f},
|
||||
{-7.55994277e+02f, 3.16730098e-04f, 4.78306139e-01f},
|
||||
{-1.02363977e+03f, 1.20223470e-04f, 9.36662319e-01f},
|
||||
{-1.26571316e+03f, 4.87340896e-06f, 1.27054498e+00f},
|
||||
{-1.42529332e+03f, -4.01150431e-05f, 1.43972784e+00f},
|
||||
{-1.17554822e+03f, -2.16378048e-05f, 1.30408023e+00f},
|
||||
{-5.00799571e+02f, -4.59832026e-06f, 1.09098763e+00f}};
|
||||
|
||||
static const float blackbody_table_b[7][4] = {
|
||||
{5.96945309e-11f, -4.85742887e-08f, -9.70622247e-05f, -4.07936148e-03f},
|
||||
{2.40430366e-11f, 5.55021075e-08f, -1.98503712e-04f, 2.89312858e-02f},
|
||||
{-1.40949732e-11f, 1.89878968e-07f, -3.56632824e-04f, 9.10767778e-02f},
|
||||
{-3.61460868e-11f, 2.84822009e-07f, -4.93211319e-04f, 1.56723440e-01f},
|
||||
{-1.97075738e-11f, 1.75359352e-07f, -2.50542825e-04f, -2.22783266e-02f},
|
||||
{-1.61997957e-13f, -1.64216008e-08f, 3.86216271e-04f, -7.38077418e-01f},
|
||||
{6.72650283e-13f, -2.73078809e-08f, 4.24098264e-04f, -7.52335691e-01f}};
|
||||
|
||||
static void blackbody_temperature_to_rec709(float rec709[3], float t)
|
||||
{
|
||||
if (t >= 12000.0f) {
|
||||
rec709[0] = 0.8262954810464208f;
|
||||
rec709[1] = 0.9945080501520986f;
|
||||
rec709[2] = 1.566307710274283f;
|
||||
}
|
||||
else if (t < 800.0f) {
|
||||
rec709[0] = 5.413294490189271f;
|
||||
rec709[1] = -0.20319390035873933f;
|
||||
rec709[2] = -0.0822535242887164f;
|
||||
}
|
||||
else {
|
||||
int i = (t >= 6365.0f) ? 6 :
|
||||
(t >= 3315.0f) ? 5 :
|
||||
(t >= 1902.0f) ? 4 :
|
||||
(t >= 1449.0f) ? 3 :
|
||||
(t >= 1167.0f) ? 2 :
|
||||
(t >= 965.0f) ? 1 :
|
||||
0;
|
||||
|
||||
const float *r = blackbody_table_r[i];
|
||||
const float *g = blackbody_table_g[i];
|
||||
const float *b = blackbody_table_b[i];
|
||||
|
||||
const float t_inv = 1.0f / t;
|
||||
rec709[0] = r[0] * t_inv + r[1] * t + r[2];
|
||||
rec709[1] = g[0] * t_inv + g[1] * t + g[2];
|
||||
rec709[2] = ((b[0] * t + b[1]) * t + b[2]) * t + b[3];
|
||||
}
|
||||
}
|
||||
|
||||
void IMB_colormanagement_blackbody_temperature_to_rgb_table(float *r_table,
|
||||
const int width,
|
||||
const float min,
|
||||
const float max)
|
||||
{
|
||||
for (int i = 0; i < width; i++) {
|
||||
float temperature = min + (max - min) / (float)width * (float)i;
|
||||
|
||||
float rec709[3];
|
||||
blackbody_temperature_to_rec709(rec709, temperature);
|
||||
|
||||
float rgb[3];
|
||||
IMB_colormanagement_rec709_to_scene_linear(rgb, rec709);
|
||||
clamp_v3(rgb, 0.0f, FLT_MAX);
|
||||
|
||||
copy_v3_v3(&r_table[i * 4], rgb);
|
||||
r_table[i * 4 + 3] = 0.0f;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* CIE color matching functions `xBar`, `yBar`, and `zBar` for
|
||||
* wavelengths from 380 through 780 nanometers, every 5 nanometers.
|
||||
*
|
||||
* For a wavelength lambda in this range:
|
||||
* \code{.txt}
|
||||
* cie_color_match[(lambda - 380) / 5][0] = xBar
|
||||
* cie_color_match[(lambda - 380) / 5][1] = yBar
|
||||
* cie_color_match[(lambda - 380) / 5][2] = zBar
|
||||
* \endcode
|
||||
*/
|
||||
|
||||
static float cie_colour_match[81][3] = {
|
||||
{0.0014f, 0.0000f, 0.0065f}, {0.0022f, 0.0001f, 0.0105f}, {0.0042f, 0.0001f, 0.0201f},
|
||||
{0.0076f, 0.0002f, 0.0362f}, {0.0143f, 0.0004f, 0.0679f}, {0.0232f, 0.0006f, 0.1102f},
|
||||
{0.0435f, 0.0012f, 0.2074f}, {0.0776f, 0.0022f, 0.3713f}, {0.1344f, 0.0040f, 0.6456f},
|
||||
{0.2148f, 0.0073f, 1.0391f}, {0.2839f, 0.0116f, 1.3856f}, {0.3285f, 0.0168f, 1.6230f},
|
||||
{0.3483f, 0.0230f, 1.7471f}, {0.3481f, 0.0298f, 1.7826f}, {0.3362f, 0.0380f, 1.7721f},
|
||||
{0.3187f, 0.0480f, 1.7441f}, {0.2908f, 0.0600f, 1.6692f}, {0.2511f, 0.0739f, 1.5281f},
|
||||
{0.1954f, 0.0910f, 1.2876f}, {0.1421f, 0.1126f, 1.0419f}, {0.0956f, 0.1390f, 0.8130f},
|
||||
{0.0580f, 0.1693f, 0.6162f}, {0.0320f, 0.2080f, 0.4652f}, {0.0147f, 0.2586f, 0.3533f},
|
||||
{0.0049f, 0.3230f, 0.2720f}, {0.0024f, 0.4073f, 0.2123f}, {0.0093f, 0.5030f, 0.1582f},
|
||||
{0.0291f, 0.6082f, 0.1117f}, {0.0633f, 0.7100f, 0.0782f}, {0.1096f, 0.7932f, 0.0573f},
|
||||
{0.1655f, 0.8620f, 0.0422f}, {0.2257f, 0.9149f, 0.0298f}, {0.2904f, 0.9540f, 0.0203f},
|
||||
{0.3597f, 0.9803f, 0.0134f}, {0.4334f, 0.9950f, 0.0087f}, {0.5121f, 1.0000f, 0.0057f},
|
||||
{0.5945f, 0.9950f, 0.0039f}, {0.6784f, 0.9786f, 0.0027f}, {0.7621f, 0.9520f, 0.0021f},
|
||||
{0.8425f, 0.9154f, 0.0018f}, {0.9163f, 0.8700f, 0.0017f}, {0.9786f, 0.8163f, 0.0014f},
|
||||
{1.0263f, 0.7570f, 0.0011f}, {1.0567f, 0.6949f, 0.0010f}, {1.0622f, 0.6310f, 0.0008f},
|
||||
{1.0456f, 0.5668f, 0.0006f}, {1.0026f, 0.5030f, 0.0003f}, {0.9384f, 0.4412f, 0.0002f},
|
||||
{0.8544f, 0.3810f, 0.0002f}, {0.7514f, 0.3210f, 0.0001f}, {0.6424f, 0.2650f, 0.0000f},
|
||||
{0.5419f, 0.2170f, 0.0000f}, {0.4479f, 0.1750f, 0.0000f}, {0.3608f, 0.1382f, 0.0000f},
|
||||
{0.2835f, 0.1070f, 0.0000f}, {0.2187f, 0.0816f, 0.0000f}, {0.1649f, 0.0610f, 0.0000f},
|
||||
{0.1212f, 0.0446f, 0.0000f}, {0.0874f, 0.0320f, 0.0000f}, {0.0636f, 0.0232f, 0.0000f},
|
||||
{0.0468f, 0.0170f, 0.0000f}, {0.0329f, 0.0119f, 0.0000f}, {0.0227f, 0.0082f, 0.0000f},
|
||||
{0.0158f, 0.0057f, 0.0000f}, {0.0114f, 0.0041f, 0.0000f}, {0.0081f, 0.0029f, 0.0000f},
|
||||
{0.0058f, 0.0021f, 0.0000f}, {0.0041f, 0.0015f, 0.0000f}, {0.0029f, 0.0010f, 0.0000f},
|
||||
{0.0020f, 0.0007f, 0.0000f}, {0.0014f, 0.0005f, 0.0000f}, {0.0010f, 0.0004f, 0.0000f},
|
||||
{0.0007f, 0.0002f, 0.0000f}, {0.0005f, 0.0002f, 0.0000f}, {0.0003f, 0.0001f, 0.0000f},
|
||||
{0.0002f, 0.0001f, 0.0000f}, {0.0002f, 0.0001f, 0.0000f}, {0.0001f, 0.0000f, 0.0000f},
|
||||
{0.0001f, 0.0000f, 0.0000f}, {0.0001f, 0.0000f, 0.0000f}, {0.0000f, 0.0000f, 0.0000f}};
|
||||
|
||||
static void wavelength_to_xyz(float xyz[3], float lambda_nm)
|
||||
{
|
||||
float ii = (lambda_nm - 380.0f) * (1.0f / 5.0f); /* Scaled 0..80. */
|
||||
int i = (int)ii;
|
||||
|
||||
if (i < 0 || i >= 80) {
|
||||
xyz[0] = 0.0f;
|
||||
xyz[1] = 0.0f;
|
||||
xyz[2] = 0.0f;
|
||||
}
|
||||
else {
|
||||
ii -= (float)i;
|
||||
const float *c = cie_colour_match[i];
|
||||
xyz[0] = c[0] + ii * (c[3] - c[0]);
|
||||
xyz[1] = c[1] + ii * (c[4] - c[1]);
|
||||
xyz[2] = c[2] + ii * (c[5] - c[2]);
|
||||
}
|
||||
}
|
||||
|
||||
void IMB_colormanagement_wavelength_to_rgb_table(float *r_table, const int width)
|
||||
{
|
||||
for (int i = 0; i < width; i++) {
|
||||
float temperature = 380 + 400 / (float)width * (float)i;
|
||||
|
||||
float xyz[3];
|
||||
wavelength_to_xyz(xyz, temperature);
|
||||
|
||||
float rgb[3];
|
||||
IMB_colormanagement_xyz_to_scene_linear(rgb, xyz);
|
||||
clamp_v3(rgb, 0.0f, FLT_MAX);
|
||||
|
||||
copy_v3_v3(&r_table[i * 4], rgb);
|
||||
r_table[i * 4 + 3] = 0.0f;
|
||||
}
|
||||
}
|
||||
|
||||
/** \} */
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
|
||||
#include "node_shader_util.hh"
|
||||
|
||||
#include "IMB_colormanagement.h"
|
||||
|
||||
namespace blender::nodes::node_shader_blackbody_cc {
|
||||
|
||||
static void node_declare(NodeDeclarationBuilder &b)
|
||||
|
|
@ -20,7 +22,7 @@ static int node_shader_gpu_blackbody(GPUMaterial *mat,
|
|||
const int size = CM_TABLE + 1;
|
||||
float *data = static_cast<float *>(MEM_mallocN(sizeof(float) * size * 4, "blackbody texture"));
|
||||
|
||||
blackbody_temperature_to_rgb_table(data, size, 965.0f, 12000.0f);
|
||||
IMB_colormanagement_blackbody_temperature_to_rgb_table(data, size, 800.0f, 12000.0f);
|
||||
|
||||
float layer;
|
||||
GPUNodeLink *ramp_texture = GPU_color_band(mat, size, data, &layer);
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
|
||||
#include "node_shader_util.hh"
|
||||
|
||||
#include "IMB_colormanagement.h"
|
||||
|
||||
namespace blender::nodes::node_shader_volume_principled_cc {
|
||||
|
||||
static void node_declare(NodeDeclarationBuilder &b)
|
||||
|
|
@ -109,7 +111,7 @@ static int node_shader_gpu_volume_principled(GPUMaterial *mat,
|
|||
float *data, layer;
|
||||
if (use_blackbody) {
|
||||
data = (float *)MEM_mallocN(sizeof(float) * size * 4, "blackbody texture");
|
||||
blackbody_temperature_to_rgb_table(data, size, 965.0f, 12000.0f);
|
||||
IMB_colormanagement_blackbody_temperature_to_rgb_table(data, size, 800.0f, 12000.0f);
|
||||
}
|
||||
else {
|
||||
data = (float *)MEM_callocN(sizeof(float) * size * 4, "blackbody black");
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
|
||||
#include "node_shader_util.hh"
|
||||
|
||||
#include "IMB_colormanagement.h"
|
||||
|
||||
namespace blender::nodes::node_shader_wavelength_cc {
|
||||
|
||||
static void node_declare(NodeDeclarationBuilder &b)
|
||||
|
|
@ -20,22 +22,11 @@ static int node_shader_gpu_wavelength(GPUMaterial *mat,
|
|||
const int size = CM_TABLE + 1;
|
||||
float *data = static_cast<float *>(MEM_mallocN(sizeof(float) * size * 4, "cie_xyz texture"));
|
||||
|
||||
wavelength_to_xyz_table(data, size);
|
||||
IMB_colormanagement_wavelength_to_rgb_table(data, size);
|
||||
|
||||
float layer;
|
||||
GPUNodeLink *ramp_texture = GPU_color_band(mat, size, data, &layer);
|
||||
XYZ_to_RGB xyz_to_rgb;
|
||||
get_XYZ_to_RGB_for_gpu(&xyz_to_rgb);
|
||||
return GPU_stack_link(mat,
|
||||
node,
|
||||
"node_wavelength",
|
||||
in,
|
||||
out,
|
||||
ramp_texture,
|
||||
GPU_constant(&layer),
|
||||
GPU_uniform(xyz_to_rgb.r),
|
||||
GPU_uniform(xyz_to_rgb.g),
|
||||
GPU_uniform(xyz_to_rgb.b));
|
||||
return GPU_stack_link(mat, node, "node_wavelength", in, out, ramp_texture, GPU_constant(&layer));
|
||||
}
|
||||
|
||||
} // namespace blender::nodes::node_shader_wavelength_cc
|
||||
|
|
|
|||
Loading…
Reference in New Issue