loader_aw

commit 71bce8f2ae0d67a8de610251f641e12cfd594c0d
parent 02d1a38ce848eb44a214eb861bae2d5e5d7a78d1
Author: vaplv <vaplv@free.fr>
Date:   Fri, 31 Jan 2020 15:08:30 +0100

Support the "map_bump" keyword in the mtl loader

Diffstat:
M
src/aw_mtl.c
 | 
8
++++++--

1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/aw_mtl.c b/src/aw_mtl.c
@@ -32,6 +32,10 @@
   #pragma warning(disable:4706) /* Assignment within a condition */
 #endif
 
+static const char* MSG_PREFIX_INFO = "load-mtl:info: ";
+static const char* MSG_PREFIX_ERROR = "load-mtl:error: ";
+static const char* MSG_PREFIX_WARNING = "load-mtl:warning: ";
+
 enum map_type {
   MAP_COMMON = BIT(0),
   MAP_SCALAR = BIT(1),
@@ -558,7 +562,7 @@ parse_mtl_line(struct aw_mtl* mtl, struct txtrdr* txtrdr)
   } else if(!strcmp(tk, "map_Ns")) { /* Specular exponent texture */
     res = parse_map
       (&mtl->newmtl->specular_exponent_map, MAP_SCALAR, &tk_ctx);
-  } else if(!strcmp(tk, "bump")) { /* Bump map */
+  } else if(!strcmp(tk, "bump") || !strcmp(tk, "map_bump")) { /* Bump map */
     res = parse_map(&mtl->newmtl->bump_map, MAP_BUMP, &tk_ctx);
   } else {
     log_warn(mtl,
@@ -664,7 +668,7 @@ aw_mtl_create
     mtl->logger = logger;
   } else {
     res = setup_default_logger(mtl->allocator, &mtl->logger__,
-      "load-mtl:info: ", "load-mtl:error: ", "load-mtl:warning: ");
+      MSG_PREFIX_INFO, MSG_PREFIX_ERROR, MSG_PREFIX_WARNING);
     if(res != RES_OK) goto error;
     mtl->logger = &mtl->logger__;
   }