manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed .obj material import (it was reading only malformed .mtl)

This commit is contained in:
Luigi Malomo 2021-11-29 09:57:43 +01:00
parent dde8bf219e
commit 1b2e3655ad
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wrap/io_trimesh/import_obj.h
View File

@ -1005,7 +1005,7 @@ public:
} }
else else
first = false; first = false;
//strcpy(currentMaterial.name, tokens[1].c_str());
if(tokens.size() < 2) if(tokens.size() < 2)
return false; return false;
else if (tokens.size() == 2) else if (tokens.size() == 2)
@ -1014,17 +1014,17 @@ public:
currentMaterial.materialName = line.substr(7); //space in the name, get everything after "newmtl " currentMaterial.materialName = line.substr(7); //space in the name, get everything after "newmtl "
} }
else if (header.compare("Ka")==0) { else if (header.compare("Ka")==0) {
if (tokens.size() < 4) { if (tokens.size() >= 4) {
currentMaterial.Ka = Point3fFrom3Tokens(tokens,1); currentMaterial.Ka = Point3fFrom3Tokens(tokens,1);
} }
} }
else if (header.compare("Kd")==0) { else if (header.compare("Kd")==0) {
if (tokens.size() < 4) { if (tokens.size() >= 4) {
currentMaterial.Kd = Point3fFrom3Tokens(tokens,1); currentMaterial.Kd = Point3fFrom3Tokens(tokens,1);
} }
} }
else if (header.compare("Ks")==0) { else if (header.compare("Ks")==0) {
if (tokens.size() < 4) { if (tokens.size() >= 4) {
currentMaterial.Ks = Point3fFrom3Tokens(tokens,1); currentMaterial.Ks = Point3fFrom3Tokens(tokens,1);
} }
} }