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

Skip trailing whitespace in mtl. Fixes #92.

Browse Source
This commit is contained in:
Syoyo Fujita
2016-08-02 16:55:50 +09:00
parent d5c722125a
commit 51d13700d8
2 changed files with 111 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test.cc
View File

@@ -302,7 +302,8 @@ std::string matStream(
"newmtl light\n" "newmtl light\n"
"Ka 20 20 20\n" "Ka 20 20 20\n"
"Kd 1 1 1\n" "Kd 1 1 1\n"
"Ks 0 0 0"); "Ks 0 0 0\n"
"map_Kd tmp.png \n"); // #92(whitespace after filename)
using namespace tinyobj; using namespace tinyobj;
class MaterialStringStreamReader: class MaterialStringStreamReader:
@@ -342,6 +343,13 @@ std::string matStream(
} }
PrintInfo(shapes, materials); PrintInfo(shapes, materials);
// #92
for (size_t i = 0; i < materials.size(); i++) {
if (materials[i].name.compare("light") == 0) {
assert(materials[i].diffuse_texname.compare("tmp.png") == 0);
}
}
return true; return true;
} }

205
tiny_obj_loader.h
View File

@@ -42,10 +42,10 @@
#ifndef TINY_OBJ_LOADER_H_ #ifndef TINY_OBJ_LOADER_H_
#define TINY_OBJ_LOADER_H_ #define TINY_OBJ_LOADER_H_
#include <cmath>
#include <map>
#include <string> #include <string>
#include <vector> #include <vector>
#include <map>
#include <cmath>
namespace tinyobj { namespace tinyobj {
@@ -99,52 +99,37 @@ typedef struct {
mesh_t mesh; mesh_t mesh;
} shape_t; } shape_t;
typedef enum typedef enum {
{ triangulation = 1, // used whether triangulate polygon face in .obj
triangulation = 1, // used whether triangulate polygon face in .obj calculate_normals =
calculate_normals = 2, // used whether calculate the normals if the .obj normals are empty 2, // used whether calculate the normals if the .obj normals are empty
// Some nice stuff here // Some nice stuff here
} load_flags_t; } load_flags_t;
class float3 class float3 {
{
public: public:
float3() float3() : x(0.0f), y(0.0f), z(0.0f) {}
: x( 0.0f )
, y( 0.0f )
, z( 0.0f )
{
}
float3(float coord_x, float coord_y, float coord_z) float3(float coord_x, float coord_y, float coord_z)
: x( coord_x ) : x(coord_x), y(coord_y), z(coord_z) {}
, y( coord_y )
, z( coord_z )
{
}
float3(const float3& from, const float3& to) float3(const float3 &from, const float3 &to) {
{
coord[0] = to.coord[0] - from.coord[0]; coord[0] = to.coord[0] - from.coord[0];
coord[1] = to.coord[1] - from.coord[1]; coord[1] = to.coord[1] - from.coord[1];
coord[2] = to.coord[2] - from.coord[2]; coord[2] = to.coord[2] - from.coord[2];
} }
float3 crossproduct ( const float3 & vec ) float3 crossproduct(const float3 &vec) {
{ float a = y * vec.z - z * vec.y;
float a = y * vec.z - z * vec.y ; float b = z * vec.x - x * vec.z;
float b = z * vec.x - x * vec.z ; float c = x * vec.y - y * vec.x;
float c = x * vec.y - y * vec.x ; return float3(a, b, c);
return float3( a , b , c );
} }
void normalize() void normalize() {
{ const float length = std::sqrt(
const float length = std::sqrt( ( coord[0] * coord[0] ) + (coord[0] * coord[0]) + (coord[1] * coord[1]) + (coord[2] * coord[2]));
( coord[1] * coord[1] ) + if (length != 1) {
( coord[2] * coord[2] ) );
if( length != 1 )
{
coord[0] = (coord[0] / length); coord[0] = (coord[0] / length);
coord[1] = (coord[1] / length); coord[1] = (coord[1] / length);
coord[2] = (coord[2] / length); coord[2] = (coord[2] / length);
@@ -152,12 +137,10 @@ public:
} }
private: private:
union union {
{
float coord[3]; float coord[3];
struct struct {
{ float x, y, z;
float x,y,z;
}; };
}; };
}; };
@@ -197,7 +180,7 @@ bool LoadObj(std::vector<shape_t> &shapes, // [output]
std::vector<material_t> &materials, // [output] std::vector<material_t> &materials, // [output]
std::string &err, // [output] std::string &err, // [output]
const char *filename, const char *mtl_basepath = NULL, const char *filename, const char *mtl_basepath = NULL,
unsigned int flags = 1 ); unsigned int flags = 1);
/// Loads object from a std::istream, uses GetMtlIStreamFn to retrieve /// Loads object from a std::istream, uses GetMtlIStreamFn to retrieve
/// std::istream for materials. /// std::istream for materials.
@@ -216,12 +199,12 @@ void LoadMtl(std::map<std::string, int> &material_map, // [output]
} }
#ifdef TINYOBJLOADER_IMPLEMENTATION #ifdef TINYOBJLOADER_IMPLEMENTATION
#include <cstdlib>
#include <cstring>
#include <cassert> #include <cassert>
#include <cctype>
#include <cmath> #include <cmath>
#include <cstddef> #include <cstddef>
#include <cctype> #include <cstdlib>
#include <cstring>
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>
@@ -267,43 +250,43 @@ struct obj_shape {
std::vector<float> vt; std::vector<float> vt;
}; };
//See http://stackoverflow.com/questions/6089231/getting-std-ifstream-to-handle-lf-cr-and-crlf // See
std::istream& safeGetline(std::istream& is, std::string& t) // http://stackoverflow.com/questions/6089231/getting-std-ifstream-to-handle-lf-cr-and-crlf
{ std::istream &safeGetline(std::istream &is, std::string &t) {
t.clear(); t.clear();
// The characters in the stream are read one-by-one using a std::streambuf. // The characters in the stream are read one-by-one using a std::streambuf.
// That is faster than reading them one-by-one using the std::istream. // That is faster than reading them one-by-one using the std::istream.
// Code that uses streambuf this way must be guarded by a sentry object. // Code that uses streambuf this way must be guarded by a sentry object.
// The sentry object performs various tasks, // The sentry object performs various tasks,
// such as thread synchronization and updating the stream state. // such as thread synchronization and updating the stream state.
std::istream::sentry se(is, true); std::istream::sentry se(is, true);
std::streambuf* sb = is.rdbuf(); std::streambuf *sb = is.rdbuf();
for(;;) { for (;;) {
int c = sb->sbumpc(); int c = sb->sbumpc();
switch (c) { switch (c) {
case '\n': case '\n':
return is; return is;
case '\r': case '\r':
if(sb->sgetc() == '\n') if (sb->sgetc() == '\n')
sb->sbumpc(); sb->sbumpc();
return is; return is;
case EOF: case EOF:
// Also handle the case when the last line has no line ending // Also handle the case when the last line has no line ending
if(t.empty()) if (t.empty())
is.setstate(std::ios::eofbit); is.setstate(std::ios::eofbit);
return is; return is;
default: default:
t += (char)c; t += (char)c;
}
} }
}
} }
#define IS_SPACE( x ) ( ( (x) == ' ') || ( (x) == '\t') ) #define IS_SPACE(x) (((x) == ' ') || ((x) == '\t'))
#define IS_DIGIT( x ) ( (unsigned int)( (x) - '0' ) < (unsigned int)10 ) #define IS_DIGIT(x) ((unsigned int)((x) - '0') < (unsigned int)10)
#define IS_NEW_LINE( x ) ( ( (x) == '\r') || ( (x) == '\n') || ( (x) == '\0') ) #define IS_NEW_LINE(x) (((x) == '\r') || ((x) == '\n') || ((x) == '\0'))
// Make index zero-base, and also support relative index. // Make index zero-base, and also support relative index.
static inline int fixIndex(int idx, int n) { static inline int fixIndex(int idx, int n) {
@@ -614,13 +597,13 @@ static bool exportFaceGroupToShape(
const std::vector<float> &in_texcoords, const std::vector<float> &in_texcoords,
const std::vector<std::vector<vertex_index> > &faceGroup, const std::vector<std::vector<vertex_index> > &faceGroup,
std::vector<tag_t> &tags, const int material_id, const std::string &name, std::vector<tag_t> &tags, const int material_id, const std::string &name,
bool clearCache, unsigned int flags, std::string& err ) { bool clearCache, unsigned int flags, std::string &err) {
if (faceGroup.empty()) { if (faceGroup.empty()) {
return false; return false;
} }
bool triangulate( ( flags & triangulation ) == triangulation ); bool triangulate((flags & triangulation) == triangulation);
bool normals_calculation( ( flags & calculate_normals ) == calculate_normals ); bool normals_calculation((flags & calculate_normals) == calculate_normals);
// Flatten vertices and indices // Flatten vertices and indices
for (size_t i = 0; i < faceGroup.size(); i++) { for (size_t i = 0; i < faceGroup.size(); i++) {
@@ -673,31 +656,41 @@ static bool exportFaceGroupToShape(
} }
if (normals_calculation && shape.mesh.normals.empty()) { if (normals_calculation && shape.mesh.normals.empty()) {
const size_t nIndexs = shape.mesh.indices.size(); const size_t nIndexs = shape.mesh.indices.size();
if (nIndexs % 3 == 0) { if (nIndexs % 3 == 0) {
shape.mesh.normals.resize(shape.mesh.positions.size()); shape.mesh.normals.resize(shape.mesh.positions.size());
for (register size_t iIndices = 0; iIndices < nIndexs; iIndices += 3) { for (register size_t iIndices = 0; iIndices < nIndexs; iIndices += 3) {
float3 v1, v2, v3; float3 v1, v2, v3;
memcpy(&v1, &shape.mesh.positions[shape.mesh.indices[iIndices] * 3], sizeof(float3)); memcpy(&v1, &shape.mesh.positions[shape.mesh.indices[iIndices] * 3],
memcpy(&v2, &shape.mesh.positions[shape.mesh.indices[iIndices + 1] * 3], sizeof(float3)); sizeof(float3));
memcpy(&v3, &shape.mesh.positions[shape.mesh.indices[iIndices + 2] * 3], sizeof(float3)); memcpy(&v2, &shape.mesh.positions[shape.mesh.indices[iIndices + 1] * 3],
sizeof(float3));
memcpy(&v3, &shape.mesh.positions[shape.mesh.indices[iIndices + 2] * 3],
sizeof(float3));
float3 v12(v1, v2); float3 v12(v1, v2);
float3 v13(v1, v3); float3 v13(v1, v3);
float3 normal = v12.crossproduct(v13); float3 normal = v12.crossproduct(v13);
normal.normalize(); normal.normalize();
memcpy(&shape.mesh.normals[shape.mesh.indices[iIndices] * 3], &normal, sizeof(float3)); memcpy(&shape.mesh.normals[shape.mesh.indices[iIndices] * 3], &normal,
memcpy(&shape.mesh.normals[shape.mesh.indices[iIndices + 1] * 3], &normal, sizeof(float3)); sizeof(float3));
memcpy(&shape.mesh.normals[shape.mesh.indices[iIndices + 2] * 3], &normal, sizeof(float3)); memcpy(&shape.mesh.normals[shape.mesh.indices[iIndices + 1] * 3],
} &normal, sizeof(float3));
} else { memcpy(&shape.mesh.normals[shape.mesh.indices[iIndices + 2] * 3],
&normal, sizeof(float3));
}
} else {
std::stringstream ss; std::stringstream ss;
ss << "WARN: The shape " << name << " does not have a topology of triangles, therfore the normals calculation could not be performed. Select the tinyobj::triangulation flag for this object." << std::endl; ss << "WARN: The shape " << name
err += ss.str(); << " does not have a topology of triangles, therfore the normals "
} "calculation could not be performed. Select the "
"tinyobj::triangulation flag for this object."
<< std::endl;
err += ss.str();
}
} }
shape.name = name; shape.name = name;
@@ -720,6 +713,11 @@ void LoadMtl(std::map<std::string, int> &material_map,
std::string linebuf; std::string linebuf;
safeGetline(inStream, linebuf); safeGetline(inStream, linebuf);
// Trim trailing whitespace
if (linebuf.size() > 0) {
linebuf = linebuf.substr(0, linebuf.find_last_not_of(" \t") + 1);
}
// Trim newline '\r\n' or '\n' // Trim newline '\r\n' or '\n'
if (linebuf.size() > 0) { if (linebuf.size() > 0) {
if (linebuf[linebuf.size() - 1] == '\n') if (linebuf[linebuf.size() - 1] == '\n')
@@ -1110,7 +1108,7 @@ bool LoadObj(std::vector<shape_t> &shapes, // [output]
if (newMaterialId != material) { if (newMaterialId != material) {
// Create per-face material // Create per-face material
exportFaceGroupToShape(shape, vertexCache, v, vn, vt, faceGroup, tags, exportFaceGroupToShape(shape, vertexCache, v, vn, vt, faceGroup, tags,
material, name, true, flags, err ); material, name, true, flags, err);
faceGroup.clear(); faceGroup.clear();
material = newMaterialId; material = newMaterialId;
} }
@@ -1146,7 +1144,7 @@ bool LoadObj(std::vector<shape_t> &shapes, // [output]
// flush previous face group. // flush previous face group.
bool ret = bool ret =
exportFaceGroupToShape(shape, vertexCache, v, vn, vt, faceGroup, tags, exportFaceGroupToShape(shape, vertexCache, v, vn, vt, faceGroup, tags,
material, name, true, flags, err ); material, name, true, flags, err);
if (ret) { if (ret) {
shapes.push_back(shape); shapes.push_back(shape);
} }
@@ -1183,7 +1181,7 @@ bool LoadObj(std::vector<shape_t> &shapes, // [output]
// flush previous face group. // flush previous face group.
bool ret = bool ret =
exportFaceGroupToShape(shape, vertexCache, v, vn, vt, faceGroup, tags, exportFaceGroupToShape(shape, vertexCache, v, vn, vt, faceGroup, tags,
material, name, true, flags, err ); material, name, true, flags, err);
if (ret) { if (ret) {
shapes.push_back(shape); shapes.push_back(shape);
} }
@@ -1239,7 +1237,8 @@ bool LoadObj(std::vector<shape_t> &shapes, // [output]
char stringValueBuffer[4096]; char stringValueBuffer[4096];
#ifdef _MSC_VER #ifdef _MSC_VER
sscanf_s(token, "%s", stringValueBuffer, (unsigned)_countof(stringValueBuffer)); sscanf_s(token, "%s", stringValueBuffer,
(unsigned)_countof(stringValueBuffer));
#else #else
sscanf(token, "%s", stringValueBuffer); sscanf(token, "%s", stringValueBuffer);
#endif #endif
@@ -1254,7 +1253,7 @@ bool LoadObj(std::vector<shape_t> &shapes, // [output]
} }
bool ret = exportFaceGroupToShape(shape, vertexCache, v, vn, vt, faceGroup, bool ret = exportFaceGroupToShape(shape, vertexCache, v, vn, vt, faceGroup,
tags, material, name, true, flags, err ); tags, material, name, true, flags, err);
if (ret) { if (ret) {
shapes.push_back(shape); shapes.push_back(shape);
} }