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

ColladaParser: use initializer lists again.

pull/706/head
Kim Kulling 2015-12-09 23:49:03 +01:00
parent bcff6210b3
commit 35fafe3a6f
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
code/ColladaParser.cpp
View File

@ -66,18 +66,18 @@ using namespace Assimp::Collada;
ColladaParser::ColladaParser( IOSystem* pIOHandler, const std::string& pFile) ColladaParser::ColladaParser( IOSystem* pIOHandler, const std::string& pFile)
: mFileName( pFile ) : mFileName( pFile )
, mReader( NULL ) , mReader( NULL )
//, mDataLibrary() , mDataLibrary()
//, mAccessorLibrary() , mAccessorLibrary()
//, mMeshLibrary() , mMeshLibrary()
//, mNodeLibrary() , mNodeLibrary()
//, mImageLibrary() , mImageLibrary()
//, mEffectLibrary() , mEffectLibrary()
//, mMaterialLibrary() , mMaterialLibrary()
//, mLightLibrary() , mLightLibrary()
//, mCameraLibrary() , mCameraLibrary()
//, mControllerLibrary() , mControllerLibrary()
, mRootNode( NULL ) , mRootNode( NULL )
//, mAnims() , mAnims()
, mUnitSize( 1.0f ) , mUnitSize( 1.0f )
, mUpDirection( UP_Y ) , mUpDirection( UP_Y )
, mFormat(FV_1_5_n ) // We assume the newest file format by default , mFormat(FV_1_5_n ) // We assume the newest file format by default
@ -88,13 +88,13 @@ ColladaParser::ColladaParser( IOSystem* pIOHandler, const std::string& pFile)
} }
// open the file // open the file
boost::scoped_ptr<IOStream> file( pIOHandler->Open( pFile ) ); boost::scoped_ptr<IOStream> file( pIOHandler->Open(pFile ) );
if ( file.get() == NULL ) { if (file.get() == NULL) {
throw DeadlyImportError( "Failed to open file " + pFile + "." ); throw DeadlyImportError( "Failed to open file " + pFile + "." );
} }
// generate a XML reader for it // generate a XML reader for it
boost::scoped_ptr<CIrrXML_IOStreamReader> mIOWrapper( new CIrrXML_IOStreamReader( file.get())); boost::scoped_ptr<CIrrXML_IOStreamReader> mIOWrapper(new CIrrXML_IOStreamReader(file.get()));
mReader = irr::io::createIrrXMLReader( mIOWrapper.get()); mReader = irr::io::createIrrXMLReader( mIOWrapper.get());
if (!mReader) { if (!mReader) {
ThrowException("Collada: Unable to open file."); ThrowException("Collada: Unable to open file.");
@ -102,9 +102,6 @@ ColladaParser::ColladaParser( IOSystem* pIOHandler, const std::string& pFile)
// start reading // start reading
ReadContents(); ReadContents();
// release file after import
//pIOHandler->Close( file.get() );
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------

1
code/ColladaParser.h
View File

@ -49,6 +49,7 @@
#include "ColladaHelper.h" #include "ColladaHelper.h"
#include "../include/assimp/ai_assert.h" #include "../include/assimp/ai_assert.h"
#include <boost/format.hpp> #include <boost/format.hpp>
#include <boost/scoped_ptr.hpp>
namespace Assimp namespace Assimp
{ {