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

Bugfix : Cleaned up code and removed const_cast in DXFImporter::ConvertMeshes. ( merged from GitHub, thanks to Riku Palomäki ). 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1219 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/5/head
kimmi 2012-03-20 20:52:28 +00:00
parent 23381d9710
commit 478846c310
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
code/DXFLoader.cpp
View File

@ -220,20 +220,21 @@ void DXFImporter::ConvertMeshes(aiScene* pScene, DXF::FileData& output)
throw DeadlyImportError("DXF: no data blocks loaded"); throw DeadlyImportError("DXF: no data blocks loaded");
} }
DXF::Block* entities = 0;
// index blocks by name // index blocks by name
DXF::BlockMap blocks_by_name; DXF::BlockMap blocks_by_name;
BOOST_FOREACH (const DXF::Block& bl, output.blocks) { BOOST_FOREACH (DXF::Block& bl, output.blocks) {
blocks_by_name[bl.name] = &bl; blocks_by_name[bl.name] = &bl;
if ( !entities && bl.name == AI_DXF_ENTITIES_MAGIC_BLOCK ) {
entities = &bl;
}
} }
const DXF::BlockMap::iterator bit = blocks_by_name.find(AI_DXF_ENTITIES_MAGIC_BLOCK); if (!entities) {
if (bit == blocks_by_name.end()) {
throw DeadlyImportError("DXF: no ENTITIES data block loaded"); throw DeadlyImportError("DXF: no ENTITIES data block loaded");
} }
// ENTITIES is currently the only block that needs to be modified,
// this is the reason that blocks_by_name stores const by default.
DXF::Block& entities = const_cast<DXF::Block&>( *(*bit).second );
typedef std::map<std::string, unsigned int> LayerMap; typedef std::map<std::string, unsigned int> LayerMap;
LayerMap layers; LayerMap layers;
@ -241,10 +242,10 @@ void DXFImporter::ConvertMeshes(aiScene* pScene, DXF::FileData& output)
// now expand all block references in the primary ENTITIES block // now expand all block references in the primary ENTITIES block
// XXX this involves heavy memory copying, consider a faster solution for future versions. // XXX this involves heavy memory copying, consider a faster solution for future versions.
ExpandBlockReferences(entities,blocks_by_name); ExpandBlockReferences(*entities,blocks_by_name);
unsigned int cur = 0; unsigned int cur = 0;
BOOST_FOREACH (boost::shared_ptr<const DXF::PolyLine> pl, entities.lines) { BOOST_FOREACH (boost::shared_ptr<const DXF::PolyLine> pl, entities->lines) {
if (pl->positions.size()) { if (pl->positions.size()) {
std::map<std::string, unsigned int>::iterator it = layers.find(pl->layer); std::map<std::string, unsigned int>::iterator it = layers.find(pl->layer);