Fix T74220 Mantaflow Color Mapping not ignoring alpha value
And also remove some sRGB hack.
This commit is contained in:
parent
bd6cc282d2
commit
9feb0d5f2e
Notes:
blender-bot
2023-02-14 12:01:57 +01:00
Referenced by issue #74220, Mantaflow Color Mapping not ignoring alpha value
|
@ -107,7 +107,6 @@ void volume_properties(vec3 ls_pos, out vec3 scattering, out float extinction)
|
|||
#ifdef USE_COBA
|
||||
float val = sample_volume_texture(densityTexture, co).r;
|
||||
vec4 tval = texture(transferTexture, val) * densityScale;
|
||||
tval.rgb = pow(tval.rgb, vec3(2.2));
|
||||
scattering = tval.rgb * 1500.0;
|
||||
extinction = max(1e-4, tval.a * 50.0);
|
||||
#else
|
||||
|
@ -127,7 +126,7 @@ void volume_properties(vec3 ls_pos, out vec3 scattering, out float extinction)
|
|||
|
||||
# ifdef VOLUME_SMOKE
|
||||
/* 800 is arbitrary and here to mimic old viewport. TODO make it a parameter */
|
||||
scattering += pow(emission.rgb, vec3(2.2)) * emission.a * 800.0;
|
||||
scattering += emission.rgb * emission.a * 800.0;
|
||||
# endif
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -99,6 +99,7 @@ static void create_color_ramp(const struct ColorBand *coba, float *data)
|
|||
{
|
||||
for (int i = 0; i < TFUNC_WIDTH; i++) {
|
||||
BKE_colorband_evaluate(coba, (float)i / TFUNC_WIDTH, &data[i * 4]);
|
||||
straight_to_premul_v4(&data[i * 4]);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -115,7 +116,7 @@ static GPUTexture *create_transfer_function(int type, const struct ColorBand *co
|
|||
break;
|
||||
}
|
||||
|
||||
GPUTexture *tex = GPU_texture_create_1d(TFUNC_WIDTH, GPU_RGBA8, data, NULL);
|
||||
GPUTexture *tex = GPU_texture_create_1d(TFUNC_WIDTH, GPU_SRGB8_A8, data, NULL);
|
||||
|
||||
MEM_freeN(data);
|
||||
|
||||
|
|
Loading…
Reference in New Issue