benkyd/tinyobjloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build on linux.

Browse Source
This commit is contained in:
Syoyo Fujita
2012-08-22 01:38:02 +09:00
parent fb35a684e5
commit 04e2eccaa9
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test.cc
View File

@@ -1,5 +1,7 @@
#include "tiny_obj_loader.h" #include "tiny_obj_loader.h"
#include <cstdio>
#include <cstdlib>
#include <cassert> #include <cassert>
#include <iostream> #include <iostream>
@@ -51,6 +53,11 @@ main(
printf(" material.map_Kd = %s\n", shapes[i].material.diffuse_texname.c_str()); printf(" material.map_Kd = %s\n", shapes[i].material.diffuse_texname.c_str());
printf(" material.map_Ks = %s\n", shapes[i].material.specular_texname.c_str()); printf(" material.map_Ks = %s\n", shapes[i].material.specular_texname.c_str());
printf(" material.map_Ns = %s\n", shapes[i].material.normal_texname.c_str()); printf(" material.map_Ns = %s\n", shapes[i].material.normal_texname.c_str());
std::map<std::string, std::string>::iterator it(shapes[i].material.unknown_parameter.begin());
std::map<std::string, std::string>::iterator itEnd(shapes[i].material.unknown_parameter.end());
for (; it != itEnd; it++) {
printf(" material.%s = %s\n", it->first.c_str(), it->second.c_str());
}
printf("\n"); printf("\n");
} }

11
tiny_obj_loader.cc
View File

@@ -5,11 +5,14 @@
// //
// //
// version 0.9.1: Add initial .mtl load suppor // version 0.9.2: Add more .mtl load support
// version 0.9.1: Add initial .mtl load support
// version 0.9.0: Initial // version 0.9.0: Initial
// //
#include <cstdlib>
#include <cstring>
#include <cassert> #include <cassert>
#include <string> #include <string>
@@ -403,13 +406,13 @@ std::string LoadMtl (
} }
// unknown parameter // unknown parameter
char* _space = strchr(token, ' '); const char* _space = strchr(token, ' ');
if(!_space) { if(!_space) {
_space = strchr(token, '\t'); _space = strchr(token, '\t');
} }
if(_space) { if(_space) {
*_space = '\0'; int len = _space - token;
std::string key = token; std::string key(token, len);
std::string value = _space + 1; std::string value = _space + 1;
material.unknown_parameter.insert(std::pair<std::string, std::string>(key, value)); material.unknown_parameter.insert(std::pair<std::string, std::string>(key, value));
} }