Fix face num calculation.

syoyo · syoyo · commit dea325cdcbed · 2016-08-13T19:27:13.000+09:00
diff --git a/experimental/tinyobj_loader_opt.h b/experimental/tinyobj_loader_opt.h
@@ -1397,7 +1397,7 @@ bool parseObj(attrib_t *attrib, std::vector<shape_t> *shapes,
               command_count[t].num_vt++;
             } else if (command.type == COMMAND_F) {
               command_count[t].num_f += command.f.size();
-              command_count[t].num_indices++;
+              command_count[t].num_indices += command.f_num_verts.size();
             }
 
             if (command.type == COMMAND_MTLLIB) {
@@ -1556,11 +1556,13 @@ bool parseObj(attrib_t *attrib, std::vector<shape_t> *shapes,
               attrib->indices[f_count + k] =
                   index_t(vertex_index, texcoord_index, normal_index);
             }
-            attrib->material_ids[face_count] = material_id;
-            attrib->face_num_verts[face_count] = commands[t][i].f.size();
+            for (size_t k = 0; k < commands[t][i].f_num_verts.size(); k++) {
+							attrib->material_ids[face_count + k] = material_id;
+							attrib->face_num_verts[face_count + k] = commands[t][i].f_num_verts[k];
+            }
 
             f_count += commands[t][i].f.size();
-            face_count++;
+            face_count += commands[t][i].f_num_verts.size();
           }
         }
       }));

Original file line number	Diff line number	Diff line change
`@@ -1397,7 +1397,7 @@ bool parseObj(attrib_t attrib, std::vector<shape_t> shapes,`
`1397`	`1397`	`command_count[t].num_vt++;`
`1398`	`1398`	`} else if (command.type == COMMAND_F) {`
`1399`	`1399`	`command_count[t].num_f += command.f.size();`
`1400`		`- command_count[t].num_indices++;`
	`1400`	`+ command_count[t].num_indices += command.f_num_verts.size();`
`1401`	`1401`	`}`
`1402`	`1402`
`1403`	`1403`	`if (command.type == COMMAND_MTLLIB) {`
`@@ -1556,11 +1556,13 @@ bool parseObj(attrib_t attrib, std::vector<shape_t> shapes,`
`1556`	`1556`	`attrib->indices[f_count + k] =`
`1557`	`1557`	`index_t(vertex_index, texcoord_index, normal_index);`
`1558`	`1558`	`}`
`1559`		`- attrib->material_ids[face_count] = material_id;`
`1560`		`- attrib->face_num_verts[face_count] = commands[t][i].f.size();`
	`1559`	`+ for (size_t k = 0; k < commands[t][i].f_num_verts.size(); k++) {`
	`1560`	`+ attrib->material_ids[face_count + k] = material_id;`
	`1561`	`+ attrib->face_num_verts[face_count + k] = commands[t][i].f_num_verts[k];`
	`1562`	`+ }`
`1561`	`1563`
`1562`	`1564`	`f_count += commands[t][i].f.size();`
`1563`		`- face_count++;`
	`1565`	`+ face_count += commands[t][i].f_num_verts.size();`
`1564`	`1566`	`}`
`1565`	`1567`	`}`
`1566`	`1568`	`}));`