Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-22 23:37:43 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

fix(gltf): convert baseColorFactor to sRGB for more accurate mid-range colors

Browse Source
This commit is contained in:
Matt
2025-10-30 12:54:46 -04:00
committed by GitHub
parent 9d14a04e8a
commit bdb7099c3a
1 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/gltf/gltf_view/lv_gltf_view_render.cpp
+32
View File
@@ -29,6 +29,10 @@
* DEFINES
*********************/
#ifndef LV_GLTF_CONVERT_BASE_COLOR_TO_SRGB
#define LV_GLTF_CONVERT_BASE_COLOR_TO_SRGB 1
#endif
/**********************
* TYPEDEFS
**********************/
@@ -49,6 +53,7 @@ static lv_result_t render_primary_output(lv_gltf_t * viewer, const lv_gltf_renwi
static void lv_gltf_view_recache_all_transforms(lv_gltf_model_t * gltf_data);
static fastgltf::math::fmat3x3 create_texture_transform_matrix(std::unique_ptr<fastgltf::TextureTransform> & transform);
static fastgltf::math::nvec4 color_convert_to_srgb(fastgltf::math::nvec4 color);
static void render_uniform_color_alpha(GLint uniform_loc, fastgltf::math::nvec4 color);
static void render_uniform_color(GLint uniform_loc, fastgltf::math::nvec3 color);
static uint32_t render_texture(uint32_t tex_unit, uint32_t tex_name, int32_t tex_coord_index,
@@ -526,7 +531,11 @@ static void draw_material(lv_gltf_t * viewer, const lv_gltf_uniform_locations_t
}
draw_lights(model, program);
#if LV_GLTF_CONVERT_BASE_COLOR_TO_SRGB
render_uniform_color_alpha(uniforms->base_color_factor, color_convert_to_srgb(gltfMaterial.pbrData.baseColorFactor));
#else
render_uniform_color_alpha(uniforms->base_color_factor, gltfMaterial.pbrData.baseColorFactor);
#endif
render_uniform_color(uniforms->emissive_factor, gltfMaterial.emissiveFactor);
GL_CALL(glUniform1f(uniforms->emissive_strength, gltfMaterial.emissiveStrength));
@@ -770,6 +779,29 @@ lv_result_t render_primary_output(lv_gltf_t * viewer, const lv_gltf_renwin_state
return glGetError() == GL_NO_ERROR ? LV_RESULT_OK : LV_RESULT_INVALID;
}
static fastgltf::math::nvec4 color_convert_to_srgb(fastgltf::math::nvec4 color)
{
const float SRGB_GAMMA = 2.4f;
const float INV_SRGB_GAMMA = 1.0f / SRGB_GAMMA;
// Apply the sRGB conversion formula:
// sRGB = 12.92 * C, if C <= 0.0031308
// sRGB = 1.055 * C^(1/2.4) - 0.055, if C > 0.0031308
fastgltf::math::nvec4 srgbColor;
for(int i = 0; i < 3; i++) { // Loop through R, G, B channels
float c = color[i];
if(c <= 0.0031308f) {
srgbColor[i] = 12.92f * c;
}
else {
srgbColor[i] = 1.055f * pow(c, INV_SRGB_GAMMA) - 0.055f;
}
}
srgbColor[3] = color[3];
return srgbColor;
}
static void render_uniform_color_alpha(GLint uniform_loc, fastgltf::math::nvec4 color)
{
GL_CALL(glUniform4f(uniform_loc, static_cast<float>(color[0]), static_cast<float>(color[1]),