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

Merge branch 'master' of https://github.com/assimp/assimp

pull/1304/head
Kim Kulling 2017-06-09 20:24:31 +02:00
parent ad74bfc260 fae5a0e71a
commit 6329a0e62b
1 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
code/IFCLoader.cpp
View File

@ -882,6 +882,7 @@ void ProcessSpatialStructures(ConversionData& conv)
} }
} }
std::vector<aiNode*> nodes;
for(const STEP::LazyObject* lz : *range) { for(const STEP::LazyObject* lz : *range) {
const IfcSpatialStructureElement* const prod = lz->ToPtr<IfcSpatialStructureElement>(); const IfcSpatialStructureElement* const prod = lz->ToPtr<IfcSpatialStructureElement>();
@ -890,20 +891,19 @@ void ProcessSpatialStructures(ConversionData& conv)
} }
IFCImporter::LogDebug("looking at spatial structure `" + (prod->Name ? prod->Name.Get() : "unnamed") + "`" + (prod->ObjectType? " which is of type " + prod->ObjectType.Get():"")); IFCImporter::LogDebug("looking at spatial structure `" + (prod->Name ? prod->Name.Get() : "unnamed") + "`" + (prod->ObjectType? " which is of type " + prod->ObjectType.Get():""));
// the primary site is referenced by an IFCRELAGGREGATES element which assigns it to the IFCPRODUCT // the primary sites are referenced by an IFCRELAGGREGATES element which assigns them to the IFCPRODUCT
const STEP::DB::RefMap& refs = conv.db.GetRefs(); const STEP::DB::RefMap& refs = conv.db.GetRefs();
STEP::DB::RefMapRange range = refs.equal_range(conv.proj.GetID()); STEP::DB::RefMapRange ref_range = refs.equal_range(conv.proj.GetID());
for(;range.first != range.second; ++range.first) { for(; ref_range.first != ref_range.second; ++ref_range.first) {
if(const IfcRelAggregates* const aggr = conv.db.GetObject((*range.first).second)->ToPtr<IfcRelAggregates>()) { if(const IfcRelAggregates* const aggr = conv.db.GetObject((*ref_range.first).second)->ToPtr<IfcRelAggregates>()) {
for(const IfcObjectDefinition& def : aggr->RelatedObjects) { for(const IfcObjectDefinition& def : aggr->RelatedObjects) {
// comparing pointer values is not sufficient, we would need to cast them to the same type first // comparing pointer values is not sufficient, we would need to cast them to the same type first
// as there is multiple inheritance in the game. // as there is multiple inheritance in the game.
if (def.GetID() == prod->GetID()) { if (def.GetID() == prod->GetID()) {
IFCImporter::LogDebug("selecting this spatial structure as root structure"); IFCImporter::LogDebug("selecting this spatial structure as root structure");
// got it, this is the primary site. // got it, this is one primary site.
conv.out->mRootNode = ProcessSpatialStructure(NULL,*prod,conv,NULL); nodes.push_back(ProcessSpatialStructure(NULL, *prod, conv, NULL));
return;
} }
} }
@ -911,19 +911,42 @@ void ProcessSpatialStructures(ConversionData& conv)
} }
} }
size_t nb_nodes = nodes.size();
IFCImporter::LogWarn("failed to determine primary site element, taking the first IfcSite"); if (nb_nodes == 0) {
for(const STEP::LazyObject* lz : *range) { IFCImporter::LogWarn("failed to determine primary site element, taking all the IfcSite");
const IfcSpatialStructureElement* const prod = lz->ToPtr<IfcSpatialStructureElement>(); for (const STEP::LazyObject* lz : *range) {
if(!prod) { const IfcSpatialStructureElement* const prod = lz->ToPtr<IfcSpatialStructureElement>();
continue; if (!prod) {
} continue;
}
conv.out->mRootNode = ProcessSpatialStructure(NULL,*prod,conv,NULL); nodes.push_back(ProcessSpatialStructure(NULL, *prod, conv, NULL));
return; }
}
IFCImporter::ThrowException("failed to determine primary site element"); nb_nodes = nodes.size();
}
if (nb_nodes == 1) {
conv.out->mRootNode = nodes[0];
}
else if (nb_nodes > 1) {
conv.out->mRootNode = new aiNode("Root");
conv.out->mRootNode->mParent = NULL;
conv.out->mRootNode->mNumChildren = static_cast<unsigned int>(nb_nodes);
conv.out->mRootNode->mChildren = new aiNode*[conv.out->mRootNode->mNumChildren];
for (size_t i = 0; i < nb_nodes; ++i) {
aiNode* node = nodes[i];
node->mParent = conv.out->mRootNode;
conv.out->mRootNode->mChildren[i] = node;
}
}
else {
IFCImporter::ThrowException("failed to determine primary site element");
}
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------