Skip trailing whitespace in mtl. Fixes #92.

test.cc

@@ -302,7 +302,8 @@ std::string matStream(
     "newmtl light\n"
     "Ka 20 20 20\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;
     class MaterialStringStreamReader:
@@ -343,6 +344,13 @@ std::string matStream(
 
   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;
 }
 

tiny_obj_loader.h

@@ -42,10 +42,10 @@
 #ifndef TINY_OBJ_LOADER_H_
 #define TINY_OBJ_LOADER_H_
 
+#include <cmath>
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
-#include <cmath>
 
 namespace tinyobj {
 
@@ -99,52 +99,37 @@ typedef struct {
   mesh_t mesh;
 } shape_t;
 
-typedef enum
+typedef enum {
-{
   triangulation = 1, // used whether triangulate polygon face in .obj
-  calculate_normals = 2,    // used whether calculate the normals if the .obj normals are empty
+  calculate_normals =
+      2, // used whether calculate the normals if the .obj normals are empty
   // Some nice stuff here
 } load_flags_t;
 
-class float3
+class float3 {
-{
 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)
-    : 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[1] = to.coord[1] - from.coord[1];
     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 b = z * vec.x - x * vec.z;
     float c = x * vec.y - y * vec.x;
     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[1] = (coord[1] / length);
       coord[2] = (coord[2] / length);
@@ -152,11 +137,9 @@ public:
   }
 
 private:
-  union
+  union {
-  {
     float coord[3];
-    struct
+    struct {
-    {
       float x, y, z;
     };
   };
@@ -216,12 +199,12 @@ void LoadMtl(std::map<std::string, int> &material_map, // [output]
 }
 
 #ifdef TINYOBJLOADER_IMPLEMENTATION
-#include <cstdlib>
-#include <cstring>
 #include <cassert>
+#include <cctype>
 #include <cmath>
 #include <cstddef>
-#include <cctype>
+#include <cstdlib>
+#include <cstring>
 
 #include <fstream>
 #include <sstream>
@@ -267,9 +250,9 @@ struct obj_shape {
   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();
 
   // The characters in the stream are read one-by-one using a std::streambuf.
@@ -678,9 +661,12 @@ static bool exportFaceGroupToShape(
       shape.mesh.normals.resize(shape.mesh.positions.size());
       for (register size_t iIndices = 0; iIndices < nIndexs; iIndices += 3) {
         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 v13(v1, v3);
@@ -688,14 +674,21 @@ static bool exportFaceGroupToShape(
         float3 normal = v12.crossproduct(v13);
         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));
+        memcpy(&shape.mesh.normals[shape.mesh.indices[iIndices + 2] * 3],
+               &normal, sizeof(float3));
       }
     } else {
 
       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
+         << " 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();
     }
   }
@@ -720,6 +713,11 @@ void LoadMtl(std::map<std::string, int> &material_map,
     std::string 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'
     if (linebuf.size() > 0) {
       if (linebuf[linebuf.size() - 1] == '\n')
@@ -1239,7 +1237,8 @@ bool LoadObj(std::vector<shape_t> &shapes,       // [output]
         char stringValueBuffer[4096];
 
 #ifdef _MSC_VER
-        sscanf_s(token, "%s", stringValueBuffer, (unsigned)_countof(stringValueBuffer));
+        sscanf_s(token, "%s", stringValueBuffer,
+                 (unsigned)_countof(stringValueBuffer));
 #else
         sscanf(token, "%s", stringValueBuffer);
 #endif