mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge

metadata
Wenzel Jakob 2013-11-20 23:32:25 +01:00
parent 0492cc81d3 961848cc81
commit 87ca4956d1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/shapes/ply.cpp
View File

@ -340,10 +340,10 @@ template<> std::tr1::function <void (ply::float32)>
return std::tr1::bind(&PLYLoader::normal_y_callback, this, _1);
} else if (property_name == "nz") {
return std::tr1::bind(&PLYLoader::normal_z_callback, this, _1);
} else if (property_name == "u") {
} else if (property_name == "u" || property_name == "texture_u" || property_name == "s") {
m_hasTexCoords = true;
return std::tr1::bind(&PLYLoader::texcoord_u_callback, this, _1);
} else if (property_name == "v") {
} else if (property_name == "v" || property_name == "texture_v" || property_name == "t") {
return std::tr1::bind(&PLYLoader::texcoord_v_callback, this, _1);
} else if (property_name == "diffuse_red" || property_name == "red") {
return std::tr1::bind(&PLYLoader::red_callback, this, _1);