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

ColladaParser: Tolerate empty data arrays and controller weights.

pull/12/head
Tor Andersson 2012-03-16 12:02:53 +01:00
parent c40b767016
commit 771d804c46
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/ColladaParser.cpp
View File

@ -599,7 +599,7 @@ void ColladaParser::ReadControllerWeights( Collada::Controller& pController)
if( mReader->getNodeType() == irr::io::EXN_ELEMENT) if( mReader->getNodeType() == irr::io::EXN_ELEMENT)
{ {
// Input channels for weight data. Two possible semantics: "JOINT" and "WEIGHT" // Input channels for weight data. Two possible semantics: "JOINT" and "WEIGHT"
if( IsElement( "input")) if( IsElement( "input") && vertexCount > 0 )
{ {
InputChannel channel; InputChannel channel;
@ -628,7 +628,7 @@ void ColladaParser::ReadControllerWeights( Collada::Controller& pController)
if( !mReader->isEmptyElement()) if( !mReader->isEmptyElement())
SkipElement(); SkipElement();
} }
else if( IsElement( "vcount")) else if( IsElement( "vcount") && vertexCount > 0 )
{ {
// read weight count per vertex // read weight count per vertex
const char* text = GetTextContent(); const char* text = GetTextContent();
@ -648,7 +648,7 @@ void ColladaParser::ReadControllerWeights( Collada::Controller& pController)
// reserve weight count // reserve weight count
pController.mWeights.resize( numWeights); pController.mWeights.resize( numWeights);
} }
else if( IsElement( "v")) else if( IsElement( "v") && vertexCount > 0 )
{ {
// read JointIndex - WeightIndex pairs // read JointIndex - WeightIndex pairs
const char* text = GetTextContent(); const char* text = GetTextContent();
@ -1656,6 +1656,7 @@ void ColladaParser::ReadDataArray()
std::string id = mReader->getAttributeValue( indexID); std::string id = mReader->getAttributeValue( indexID);
int indexCount = GetAttribute( "count"); int indexCount = GetAttribute( "count");
unsigned int count = (unsigned int) mReader->getAttributeValueAsInt( indexCount); unsigned int count = (unsigned int) mReader->getAttributeValueAsInt( indexCount);
if (count == 0) { return; } // some exporters write empty data arrays with count="0"
const char* content = TestTextContent(); const char* content = TestTextContent();
// read values and store inside an array in the data library // read values and store inside an array in the data library