v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #322 from Gargaj/patch-2 

Handle both types of element names
pull/324/head
Alexander Gessler 2014-08-02 10:07:39 -07:00
parent 5d861a8250 e5ed62581d
commit 95139b3576
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/FBXMeshGeometry.cpp
View File

@ -466,8 +466,9 @@ void MeshGeometry::ReadVertexDataTangents(std::vector<aiVector3D>& tangents_out,
const std::string& MappingInformationType, const std::string& MappingInformationType,
const std::string& ReferenceInformationType) const std::string& ReferenceInformationType)
{ {
const char * str = source.Elements().count( "Tangents" ) > 0 ? "Tangents" : "Tangent";
ResolveVertexDataArray(tangents_out,source,MappingInformationType,ReferenceInformationType, ResolveVertexDataArray(tangents_out,source,MappingInformationType,ReferenceInformationType,
"Tangent", str,
"TangentIndex", "TangentIndex",
vertices.size(), vertices.size(),
mapping_counts, mapping_counts,
@ -481,8 +482,9 @@ void MeshGeometry::ReadVertexDataBinormals(std::vector<aiVector3D>& binormals_ou
const std::string& MappingInformationType, const std::string& MappingInformationType,
const std::string& ReferenceInformationType) const std::string& ReferenceInformationType)
{ {
const char * str = source.Elements().count( "Binormals" ) > 0 ? "Binormals" : "Binormal";
ResolveVertexDataArray(binormals_out,source,MappingInformationType,ReferenceInformationType, ResolveVertexDataArray(binormals_out,source,MappingInformationType,ReferenceInformationType,
"Binormal", str,
"BinormalIndex", "BinormalIndex",
vertices.size(), vertices.size(),
mapping_counts, mapping_counts,