- Bugfix: ColladaParser now properly tunnels XML reading through the Assimp IO System
- Bugfix: IrrXML-IOWrapper now properly inherits the irr interface - moved some "using namespace" directives out of the header git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@351 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
@@ -110,7 +110,7 @@ void ColladaLoader::InternReadFile( const std::string& pFile, aiScene* pScene, I
|
||||
mTextures.clear();
|
||||
|
||||
// parse the input file
|
||||
ColladaParser parser( pFile);
|
||||
ColladaParser parser( pIOHandler, pFile);
|
||||
|
||||
if( !parser.mRootNode)
|
||||
throw new ImportErrorException( "Collada: File came out empty. Something is wrong here.");
|
||||
@@ -154,16 +154,6 @@ void ColladaLoader::InternReadFile( const std::string& pFile, aiScene* pScene, I
|
||||
// store all lights
|
||||
StoreSceneLights( pScene);
|
||||
|
||||
// if we know which camera is the primary camera, copy it to index 0
|
||||
if (0 == parser.mRootNode->mPrimaryCamera.length()) {
|
||||
for (unsigned int i = 1; i < mCameras.size(); ++i) {
|
||||
if (mCameras[i]->mName == parser.mRootNode->mPrimaryCamera) {
|
||||
std::swap(mCameras[i],mCameras[0]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// store all cameras
|
||||
StoreSceneCameras( pScene);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user