@@ -23,6 +23,7 @@ THE SOFTWARE.
23
23
*/
24
24
25
25
//
26
+ // version 1.3.1 : Make ParseTextureNameAndOption API public
26
27
// version 1.3.0 : Separate warning and error message(breaking API of LoadObj)
27
28
// version 1.2.3 : Added color space extension('-colorspace') to tex opts.
28
29
// version 1.2.2 : Parse multiple group names.
@@ -386,6 +387,18 @@ void LoadMtl(std::map<std::string, int> *material_map,
386
387
std::vector<material_t > *materials, std::istream *inStream,
387
388
std::string *warning, std::string *err);
388
389
390
+ // /
391
+ // / Parse texture name and texture option for custom texture parameter through material::unknown_parameter
392
+ // /
393
+ // / @param[out] texname Parsed texture name
394
+ // / @param[out] texopt Parsed texopt
395
+ // / @param[in] linebuf Input string
396
+ // / @param[in] is_bump Is this texture bump/normal?
397
+ // /
398
+ bool ParseTextureNameAndOption (std::string *texname,
399
+ texture_option_t *texopt,
400
+ const char *linebuf,
401
+ const bool is_bump);
389
402
} // namespace tinyobj
390
403
391
404
#endif // TINY_OBJ_LOADER_H_
@@ -891,7 +904,7 @@ static vertex_index_t parseRawTriple(const char **token) {
891
904
return vi;
892
905
}
893
906
894
- static bool ParseTextureNameAndOption (std::string *texname,
907
+ bool ParseTextureNameAndOption (std::string *texname,
895
908
texture_option_t *texopt,
896
909
const char *linebuf, const bool is_bump) {
897
910
// @todo { write more robust lexer and parser. }
0 commit comments