From fe54b39afdd08ece2a68c61be6e78c7b7cc8bee7 Mon Sep 17 00:00:00 2001
From: Jeeves <guydoodlesdev@gmail.com>
Date: Thu, 12 Jun 2025 06:59:22 -0600
Subject: [PATCH] improve game icon

---
 .gitignore          |   1 +
 icon-normal-3.png   | Bin 0 -> 4932 bytes
 src/main.zig        |  13 ++++++-------
 src/shaders/icon.fs |   6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 icon-normal-3.png

diff --git a/.gitignore b/.gitignore
index 8454e44..f2b3048 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ zig-out/
 /docgen_tmp/
 
 # Temporary project-specific things
+qgl/
 vsh/
 dumped/
 menu/
diff --git a/icon-normal-3.png b/icon-normal-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..70b85793e84ab2c16942ddf568e1c6368a01d95e
GIT binary patch
literal 4932
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

literal 0
HcmV?d00001

diff --git a/src/main.zig b/src/main.zig
index e32b3e9..e6ac84a 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -21,8 +21,7 @@ pub fn main() !void {
     defer crossmenu.deinit();
 
     const game_column = try crossmenu.appendColumn(.{
-        .icon = raylib.LoadTexture("icon-mask.png"),
-        .normal = raylib.LoadTexture("icon-normal-2.png"),
+        .icon = raylib.LoadTexture("icon-normal-3.png"),
         .title = "Game",
     });
 
@@ -273,18 +272,18 @@ pub const Column = struct {
 
     pub const Options = struct {
         icon: raylib.Texture2D,
-        normal: ?raylib.Texture2D = null,
         title: []const u8,
     };
 
     pub fn init(allocator: Allocator, options: Options) Column {
         raylib.SetTextureFilter(options.icon, raylib.TEXTURE_FILTER_BILINEAR);
+        raylib.SetTextureWrap(options.icon, raylib.TEXTURE_WRAP_CLAMP);
 
         return .{
             .items = .init(allocator),
             .icon = .{
                 .texture = options.icon,
-                .normal = options.normal,
+                .is_normal_map = true,
             },
             .title = .{
                 .string = options.title,
@@ -627,7 +626,8 @@ pub const BoundingBox = struct {
 pub const Image = struct {
     box: BoundingBox = undefined,
     texture: raylib.Texture2D,
-    normal: ?raylib.Texture2D = null,
+    // normal: ?raylib.Texture2D = null,
+    is_normal_map: bool = false,
 
     mode: Mode = .fit,
     align_h: Align = .center,
@@ -664,8 +664,7 @@ pub const Image = struct {
                 raylib.MAROON,
             );
         } else {
-            if (self.normal) |n| {
-                raylib.SetShaderValueTexture(icon_shader, raylib.GetShaderLocation(icon_shader, "textureNormal"), n);
+            if (self.is_normal_map) {
                 raylib.BeginShaderMode(icon_shader);
                 defer raylib.EndShaderMode();
                 raylib.DrawTextureEx(self.texture, position, 0, scale, raylib.WHITE);
diff --git a/src/shaders/icon.fs b/src/shaders/icon.fs
index a83e8fd..693a8dd 100644
--- a/src/shaders/icon.fs
+++ b/src/shaders/icon.fs
@@ -4,7 +4,7 @@ in vec2 fragTexCoord;
 in vec4 fragColor;
 
 uniform sampler2D texture0;
-uniform sampler2D textureNormal;
+// uniform sampler2D textureNormal;
 
 uniform vec3 lightDir;
 uniform vec4 lightColor;
@@ -15,7 +15,7 @@ out vec4 finalColor;
 
 void main() {
 	float d = length(lightDir);
-	vec3 n = normalize(texture(textureNormal, fragTexCoord).xyz);
+	vec3 n = normalize(texture(texture0, fragTexCoord).xyz);
 	vec3 l = normalize(lightDir);
 	
 	vec3 diffuse = lightColor.rgb * lightColor.a * max(dot(n, l), 0.0);
@@ -25,5 +25,5 @@ void main() {
 
 	vec3 final = diffuse.rgb * intensity;
 
-	finalColor = vec4(final, texture(texture0, fragTexCoord).a * 0.93);
+	finalColor = vec4(final, texture(texture0, fragTexCoord).a);
 }