abdelrahman/tinyrenderer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update variable names

Browse Source
This commit is contained in:
Abdelrahman Said 2024-09-13 12:57:15 +01:00
parent f45e30620f
commit c739864489
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main.c
View File

@ -27,7 +27,7 @@ typedef struct tiny_args TinyArgs;
struct tiny_args { struct tiny_args {
Str8 obj; Str8 obj;
Str8 diffuse; Str8 diffuse;
Str8 nm_tangent; Str8 tangent;
}; };
internal TinyArgs parse_args(Arena *arena, int argc, char *argv[]); 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.diffuse = (Str8){0};
} }
args.nm_tangent = str8_substr(arena, &args.obj, 0, substr_end); args.tangent = str8_substr(arena, &args.obj, 0, substr_end);
str8_concat(arena, &args.nm_tangent, "_nm_tangent.pnm"); str8_concat(arena, &args.tangent, "_tangent.pnm");
if (!file_exists(&args.nm_tangent)) { if (!file_exists(&args.tangent)) {
args.nm_tangent = (Str8){0}; args.tangent = (Str8){0};
} }
return args; return args;
@ -86,9 +86,9 @@ internal i32 tinyrenderer(Arena *arena, TinyArgs args) {
return TINY_EXIT_RENDER_INIT_FAILED; return TINY_EXIT_RENDER_INIT_FAILED;
} }
Model obj = load_obj_file( const char *diffuse = args.diffuse.length > 0 ? args.diffuse.str : NULL;
arena, args.obj.str, args.diffuse.length > 0 ? args.diffuse.str : NULL, const char *tangent = args.tangent.length > 0 ? args.tangent.str : NULL;
args.nm_tangent.length > 0 ? args.nm_tangent.str : NULL); Model obj = load_obj_file(arena, args.obj.str, diffuse, tangent);
if (IS_INVALID_MODEL(obj)) { if (IS_INVALID_MODEL(obj)) {
return TINY_EXIT_MODEL_LOAD_FAILED; return TINY_EXIT_MODEL_LOAD_FAILED;
} }

12
src/model/obj.c
View File

@ -5,8 +5,8 @@
#include "vec.h" #include "vec.h"
#include <stdio.h> #include <stdio.h>
Model load_obj_file(Arena *arena, const char *filename, const char *texture, Model load_obj_file(Arena *arena, const char *filename, const char *diffuse,
const char *normal_map) { const char *tangent) {
if (!arena) { if (!arena) {
return INVALID_MODEL; return INVALID_MODEL;
} }
@ -75,12 +75,12 @@ Model load_obj_file(Arena *arena, const char *filename, const char *texture,
} }
} }
if (texture) { if (diffuse) {
model.texture = load_p6_image(arena, texture); model.texture = load_p6_image(arena, diffuse);
} }
if (normal_map) { if (tangent) {
model.normal = load_p6_image(arena, normal_map); model.normal = load_p6_image(arena, tangent);
} }
return model; return model;

4
src/model/obj.h
View File

@ -58,7 +58,7 @@ struct model {
Image *normal; Image *normal;
}; };
Model load_obj_file(Arena *arena, const char *filename, const char *texture, Model load_obj_file(Arena *arena, const char *filename, const char *diffuse,
const char *normal_map); const char *tangent);
#endif // OBJ_H #endif // OBJ_H