Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fbx: permit empty deformers.

Browse Source
This commit is contained in:
Alexander Gessler
2012-07-26 22:57:52 +02:00
parent 666f2776d7
commit 3e3eb6fb7c
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/FBXDeformer.cpp
View File

@@ -82,25 +82,29 @@ Cluster::Cluster(uint64_t id, const Element& element, const Document& doc, const
{
const Scope& sc = GetRequiredScope(element);
const Element& Indexes = GetRequiredElement(sc,"Indexes",&element);
const Element& Weights = GetRequiredElement(sc,"Weights",&element);
const Element* const Indexes = sc["Indexes"];
const Element* const Weights = sc["Weights"];
const Element& Transform = GetRequiredElement(sc,"Transform",&element);
const Element& TransformLink = GetRequiredElement(sc,"TransformLink",&element);
transform = ReadMatrix(Transform);
transformLink = ReadMatrix(TransformLink);
ReadVectorDataArray(indices,Indexes);
ReadVectorDataArray(weights,Weights);
// it is actually possible that there be Deformer's with no weights
if (!!Indexes != !!Weights) {
DOMError("either Indexes or Weights are missing from Cluster",&element);
}
if(Indexes) {
ReadVectorDataArray(indices,*Indexes);
ReadVectorDataArray(weights,*Weights);
}
if(indices.size() != weights.size()) {
DOMError("sizes of index and weight array don't match up",&element);
}
if(!indices.size()) {
DOMWarning("encountered empty deformer",&element);
}
// read assigned node
const std::vector<const Connection*>& conns = doc.GetConnectionsByDestinationSequenced(ID(),"Deformer");
BOOST_FOREACH(const Connection* con, conns) {