diff options
Diffstat (limited to 'src/3rdparty/assimp/code/BaseProcess.cpp')
| -rw-r--r-- | src/3rdparty/assimp/code/BaseProcess.cpp | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/src/3rdparty/assimp/code/BaseProcess.cpp b/src/3rdparty/assimp/code/BaseProcess.cpp index 9bac9ec89..580f89cdb 100644 --- a/src/3rdparty/assimp/code/BaseProcess.cpp +++ b/src/3rdparty/assimp/code/BaseProcess.cpp @@ -3,12 +3,12 @@ Open Asset Import Library (assimp) --------------------------------------------------------------------------- -Copyright (c) 2006-2012, assimp team +Copyright (c) 2006-2016, assimp team All rights reserved. -Redistribution and use of this software in source and binary forms, -with or without modification, are permitted provided that the following +Redistribution and use of this software in source and binary forms, +with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above @@ -25,26 +25,26 @@ conditions are met: derived from this software without specific prior written permission of the assimp team. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --------------------------------------------------------------------------- */ /** @file Implementation of BaseProcess */ -#include "AssimpPCH.h" #include "BaseImporter.h" #include "BaseProcess.h" - +#include <assimp/DefaultLogger.hpp> +#include <assimp/scene.h> #include "Importer.h" using namespace Assimp; @@ -61,45 +61,45 @@ BaseProcess::BaseProcess() // Destructor, private as well BaseProcess::~BaseProcess() { - // nothing to do here + // nothing to do here } // ------------------------------------------------------------------------------------------------ void BaseProcess::ExecuteOnScene( Importer* pImp) { - ai_assert(NULL != pImp && NULL != pImp->Pimpl()->mScene); + ai_assert(NULL != pImp && NULL != pImp->Pimpl()->mScene); - progress = pImp->GetProgressHandler(); - ai_assert(progress); + progress = pImp->GetProgressHandler(); + ai_assert(progress); - SetupProperties( pImp ); + SetupProperties( pImp ); - // catch exceptions thrown inside the PostProcess-Step - try - { - Execute(pImp->Pimpl()->mScene); + // catch exceptions thrown inside the PostProcess-Step + try + { + Execute(pImp->Pimpl()->mScene); - } catch( const std::exception& err ) { + } catch( const std::exception& err ) { - // extract error description - pImp->Pimpl()->mErrorString = err.what(); - DefaultLogger::get()->error(pImp->Pimpl()->mErrorString); + // extract error description + pImp->Pimpl()->mErrorString = err.what(); + DefaultLogger::get()->error(pImp->Pimpl()->mErrorString); - // and kill the partially imported data - delete pImp->Pimpl()->mScene; - pImp->Pimpl()->mScene = NULL; - } + // and kill the partially imported data + delete pImp->Pimpl()->mScene; + pImp->Pimpl()->mScene = NULL; + } } // ------------------------------------------------------------------------------------------------ void BaseProcess::SetupProperties(const Importer* /*pImp*/) { - // the default implementation does nothing + // the default implementation does nothing } // ------------------------------------------------------------------------------------------------ bool BaseProcess::RequireVerboseFormat() const { - return true; + return true; } |