[render] more explicative uintABGRToVec4Color shaders common function

cnr-isti-vclab · Feb 8, 2025 · f30aefd · f30aefd
1 parent 7136190
commit f30aefd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/vclib/render/shaders/vclib/bgfx/drawable/drawable_mesh/fs_drawable_mesh.sc b/vclib/render/shaders/vclib/bgfx/drawable/drawable_mesh/fs_drawable_mesh.sc
@@ -84,7 +84,7 @@ void main()
             light = computeLight(u_lightDir, u_lightColor, normal);
         }
 
-        color = uintToVec4Color(floatBitsToUint(u_userPointColorFloat));
+        color = uintABGRToVec4Color(floatBitsToUint(u_userPointColorFloat));
 
         if (bool(drawMode0 & VCL_MRS_POINTS_COLOR_VERTEX)) {
             color = v_color;
@@ -118,7 +118,7 @@ void main()
         }
 
         /***** compute color ******/
-        color = uintToVec4Color(floatBitsToUint(u_userSurfaceColorFloat));
+        color = uintABGRToVec4Color(floatBitsToUint(u_userSurfaceColorFloat));
 
         if (bool(drawMode0 & VCL_MRS_SURF_COLOR_VERTEX)) {
             color = v_color;
@@ -127,7 +127,7 @@ void main()
             color = u_meshColor;
         }
         if (bool(drawMode0 & VCL_MRS_SURF_COLOR_FACE)) {
-            color = uintToVec4Color(primitiveColors[gl_PrimitiveID]);
+            color = uintABGRToVec4Color(primitiveColors[gl_PrimitiveID]);
         }
         if (bool(drawMode0 & VCL_MRS_SURF_TEX_VERTEX)) {
             color = getColorFromTexture(0, v_texcoord0);
@@ -142,7 +142,7 @@ void main()
             light = computeLight(u_lightDir, u_lightColor, normal);
         }
 
-        color = uintToVec4Color(floatBitsToUint(u_userWireframeColorFloat));
+        color = uintABGRToVec4Color(floatBitsToUint(u_userWireframeColorFloat));
 
         if (bool(drawMode0 & VCL_MRS_WIREFRAME_COLOR_VERT)) {
             color = v_color;
@@ -175,7 +175,7 @@ void main()
         }
 
         /***** compute color ******/
-        color = uintToVec4Color(floatBitsToUint(u_userEdgesColorFloat));
+        color = uintABGRToVec4Color(floatBitsToUint(u_userEdgesColorFloat));
 
         if (bool(drawMode1 & VCL_MRS_EDGES_COLOR_VERTEX)) {
             color = v_color;
@@ -184,7 +184,7 @@ void main()
             color = u_meshColor;
         }
         if (bool(drawMode1 & VCL_MRS_EDGES_COLOR_EDGE)) {
-            color = uintToVec4Color(primitiveColors[gl_PrimitiveID]);
+            color = uintABGRToVec4Color(primitiveColors[gl_PrimitiveID]);
         }
         depthOffset = 0.00005;
     }

diff --git a/vclib/render/shaders/vclib/bgfx/shaders_common.sh b/vclib/render/shaders/vclib/bgfx/shaders_common.sh
@@ -26,7 +26,12 @@
 #include <bgfx_shader.sh>
 #include <bgfx_compute.sh>
 
-vec4 uintToVec4Color(uint color)
+/**
+ * @brief Convert an uint color in ABGR format to a vec4 float color.
+ * @param[in] color: The input color.
+ * @return The output color.
+ */
+vec4 uintABGRToVec4Color(uint color)
 {
     return vec4(
         float(color & uint(0x000000FF)) / 255.0,