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

- fbx: read node hierarchy and assign model material indices. Cache already converted materials and meshes to make FBX instancing work as intended.

Browse Source
This commit is contained in:
Alexander Gessler
2012-07-04 16:33:21 +02:00
parent 17629f1ff1
commit bf79c83bf2
5 changed files with 1579 additions and 1464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/FBXDocument.cpp
View File

@@ -413,6 +413,9 @@ const Object* LazyObject::Get()
object.reset(new MeshGeometry(id,element,name,doc));
}
}
else if (!strncmp(obtype,"Model",length)) {
object.reset(new Model(id,element,doc,name));
}
else if (!strncmp(obtype,"Material",length)) {
object.reset(new Material(id,element,doc,name));
}
@@ -603,7 +606,8 @@ void Document::ReadConnections()
continue;
}
if(objects.find(dest) == objects.end()) {
// dest may be 0 (root node)
if(dest && objects.find(dest) == objects.end()) {
DOMWarning("destination object for connection does not exist",&el);
continue;
}
@@ -669,7 +673,8 @@ Connection::Connection(uint64_t insertionOrder, uint64_t src, uint64_t dest, co
, doc(doc)
{
ai_assert(doc.Objects().find(src) != doc.Objects().end());
ai_assert(doc.Objects().find(dest) != doc.Objects().end());
// dest may be 0 (root node)
ai_assert(!dest || doc.Objects().find(dest) != doc.Objects().end());
}