From c7398644890c3fe3e8f796cd0dba567759d7ac6f Mon Sep 17 00:00:00 2001
From: Abdelrahman <said.abdelrahman89@gmail.com>
Date: Fri, 13 Sep 2024 12:57:15 +0100
Subject: [PATCH] Update variable names

---
 src/main.c      | 16 ++++++++--------
 src/model/obj.c | 12 ++++++------
 src/model/obj.h |  4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main.c b/src/main.c
index fd79d1a..49d6732 100644
--- a/src/main.c
+++ b/src/main.c
@@ -27,7 +27,7 @@ typedef struct tiny_args TinyArgs;
 struct tiny_args {
   Str8 obj;
   Str8 diffuse;
-  Str8 nm_tangent;
+  Str8 tangent;
 };
 
 internal TinyArgs parse_args(Arena *arena, int argc, char *argv[]);
@@ -69,10 +69,10 @@ internal TinyArgs parse_args(Arena *arena, int argc, char *argv[]) {
     args.diffuse = (Str8){0};
   }
 
-  args.nm_tangent = str8_substr(arena, &args.obj, 0, substr_end);
-  str8_concat(arena, &args.nm_tangent, "_nm_tangent.pnm");
-  if (!file_exists(&args.nm_tangent)) {
-    args.nm_tangent = (Str8){0};
+  args.tangent = str8_substr(arena, &args.obj, 0, substr_end);
+  str8_concat(arena, &args.tangent, "_tangent.pnm");
+  if (!file_exists(&args.tangent)) {
+    args.tangent = (Str8){0};
   }
 
   return args;
@@ -86,9 +86,9 @@ internal i32 tinyrenderer(Arena *arena, TinyArgs args) {
     return TINY_EXIT_RENDER_INIT_FAILED;
   }
 
-  Model obj = load_obj_file(
-      arena, args.obj.str, args.diffuse.length > 0 ? args.diffuse.str : NULL,
-      args.nm_tangent.length > 0 ? args.nm_tangent.str : NULL);
+  const char *diffuse = args.diffuse.length > 0 ? args.diffuse.str : NULL;
+  const char *tangent = args.tangent.length > 0 ? args.tangent.str : NULL;
+  Model obj = load_obj_file(arena, args.obj.str, diffuse, tangent);
   if (IS_INVALID_MODEL(obj)) {
     return TINY_EXIT_MODEL_LOAD_FAILED;
   }
diff --git a/src/model/obj.c b/src/model/obj.c
index e3cb33b..98a1f5d 100644
--- a/src/model/obj.c
+++ b/src/model/obj.c
@@ -5,8 +5,8 @@
 #include "vec.h"
 #include <stdio.h>
 
-Model load_obj_file(Arena *arena, const char *filename, const char *texture,
-                    const char *normal_map) {
+Model load_obj_file(Arena *arena, const char *filename, const char *diffuse,
+                    const char *tangent) {
   if (!arena) {
     return INVALID_MODEL;
   }
@@ -75,12 +75,12 @@ Model load_obj_file(Arena *arena, const char *filename, const char *texture,
     }
   }
 
-  if (texture) {
-    model.texture = load_p6_image(arena, texture);
+  if (diffuse) {
+    model.texture = load_p6_image(arena, diffuse);
   }
 
-  if (normal_map) {
-    model.normal = load_p6_image(arena, normal_map);
+  if (tangent) {
+    model.normal = load_p6_image(arena, tangent);
   }
 
   return model;
diff --git a/src/model/obj.h b/src/model/obj.h
index a03ae68..2505ddb 100644
--- a/src/model/obj.h
+++ b/src/model/obj.h
@@ -58,7 +58,7 @@ struct model {
   Image *normal;
 };
 
-Model load_obj_file(Arena *arena, const char *filename, const char *texture,
-                    const char *normal_map);
+Model load_obj_file(Arena *arena, const char *filename, const char *diffuse,
+                    const char *tangent);
 
 #endif // OBJ_H