Ignore leading whitespaces in newmtl. Fixes #356

syoyo · syoyo · commit 45f683cb3122 · 2022-12-13T20:11:55.000+09:00
diff --git a/models/issue-356-leading-spaces-newmtl.mtl b/models/issue-356-leading-spaces-newmtl.mtl
@@ -0,0 +1,2 @@
+newmtl  aaa
+Ka 1.000000 1.000000 1.000000
diff --git a/models/issue-356-leading-spaces-newmtl.obj b/models/issue-356-leading-spaces-newmtl.obj
@@ -0,0 +1,2 @@
+mtllib  issue-356-leading-spaces-newmtl.mtl
+usemtl  aaa
diff --git a/tiny_obj_loader.h b/tiny_obj_loader.h
@@ -2108,9 +2108,14 @@ void LoadMtl(std::map<std::string, int> *material_map,
       // set new mtl name
       token += 7;
       {
-        std::stringstream sstr;
-        sstr << token;
-        material.name = sstr.str();
+        std::string namebuf = parseString(&token);
+        // TODO: empty name check?
+        if (namebuf.empty()) {
+          if (warning) {
+            (*warning) += "empty material name in `newmtl`\n";
+          }
+        }
+        material.name = namebuf;
       }
       continue;
     }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+mtllib issue-356-leading-spaces-newmtl.mtl`
	`2`	`+usemtl aaa`
Original file line number	Diff line number	Diff line change
`@@ -2108,9 +2108,14 @@ void LoadMtl(std::map<std::string, int> *material_map,`
`2108`	`2108`	`// set new mtl name`
`2109`	`2109`	`token += 7;`
`2110`	`2110`	`{`
`2111`		`- std::stringstream sstr;`
`2112`		`- sstr << token;`
`2113`		`- material.name = sstr.str();`
	`2111`	`+ std::string namebuf = parseString(&token);`
	`2112`	`+ // TODO: empty name check?`
	`2113`	`+ if (namebuf.empty()) {`
	`2114`	`+ if (warning) {`
	`2115`	+ (*warning) += "empty material name in `newmtl`\n";
	`2116`	`+ }`
	`2117`	`+ }`
	`2118`	`+ material.name = namebuf;`
`2114`	`2119`	`}`
`2115`	`2120`	`continue;`
`2116`	`2121`	`}`