From f1d9542ef3eece60873f7688be9b0a8180f024ca Mon Sep 17 00:00:00 2001 From: Rod Kay Date: Wed, 10 Sep 2025 06:24:29 +1000 Subject: [PATCH] opengl: More on texturing. --- 3-mid/opengl/assets/shader/lit_colored_text.frag | 3 +++ .../source/lean/model/opengl-model-text-lit_colored.adb | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/3-mid/opengl/assets/shader/lit_colored_text.frag b/3-mid/opengl/assets/shader/lit_colored_text.frag index 77e5ed4..710eef5 100644 --- a/3-mid/opengl/assets/shader/lit_colored_text.frag +++ b/3-mid/opengl/assets/shader/lit_colored_text.frag @@ -158,6 +158,9 @@ main() Surface_to_Camera); } + // linear_Color.g = 1.0; + linear_Color += surface_Color.rgb; + vec3 Gamma = vec3 (1.0 / 2.2); final_Color = vec4 (pow (linear_Color, // Final color (after gamma correction). diff --git a/3-mid/opengl/source/lean/model/opengl-model-text-lit_colored.adb b/3-mid/opengl/source/lean/model/opengl-model-text-lit_colored.adb index d51f03b..f34ca08 100644 --- a/3-mid/opengl/source/lean/model/opengl-model-text-lit_colored.adb +++ b/3-mid/opengl/source/lean/model/opengl-model-text-lit_colored.adb @@ -81,9 +81,14 @@ is is pragma unreferenced (Textures); - text_Scale : constant Vector_3 := [2.0 * 4.0 / 78.0, -- TODO: Fix scaling. - 2.0 * 4.0 / 95.0, + -- text_Scale : constant Vector_3 := [2.0 * 4.0 / 78.0, -- TODO: Fix scaling. + -- 2.0 * 4.0 / 95.0, + -- 1.0 / 1.0]; + + text_Scale : constant Vector_3 := [1.0 * 1.0 / 78.0, -- TODO: Fix scaling. + 1.0 * 1.0 / 95.0, 1.0 / 1.0]; + begin if Self.Text.all = "" then