- Make C-API threadsafe even without boost (no longer a global importer <-> scene map). - Cleanup headers. - Change the way how Importer::pimpl is accessed - all users are no longer friends of Importer to avoid spoiling the public interface. Rather, pimpl is exposed via a public member function and anyone having the definition of ImporterPimpl can access it. THIS IS A BREAKING API CHANGE for anyone using properties with the C API. It is, however, a huge step forward and finally makes our C API functionally equivalent to the C++ interface. I hope we can adapt all ports as soon as possible. I'd be grateful if the respective maintainers could do this. Documentation is not yet up to date. All this is in anticipation to the upcoming 3.0 release, which I'm actively working on. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1111 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
106 lines
3.5 KiB
C++
106 lines
3.5 KiB
C++
/*
|
|
---------------------------------------------------------------------------
|
|
Open Asset Import Library (ASSIMP)
|
|
---------------------------------------------------------------------------
|
|
|
|
Copyright (c) 2006-2010, ASSIMP Development 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
|
|
conditions are met:
|
|
|
|
* Redistributions of source code must retain the above
|
|
copyright notice, this list of conditions and the
|
|
following disclaimer.
|
|
|
|
* Redistributions in binary form must reproduce the above
|
|
copyright notice, this list of conditions and the
|
|
following disclaimer in the documentation and/or other
|
|
materials provided with the distribution.
|
|
|
|
* Neither the name of the ASSIMP team, nor the names of its
|
|
contributors may be used to endorse or promote products
|
|
derived from this software without specific prior
|
|
written permission of the ASSIMP Development Team.
|
|
|
|
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
|
|
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
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
|
|
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 "Importer.h"
|
|
|
|
using namespace Assimp;
|
|
|
|
// ------------------------------------------------------------------------------------------------
|
|
// Constructor to be privately used by Importer
|
|
BaseProcess::BaseProcess()
|
|
: shared()
|
|
, progress()
|
|
{
|
|
}
|
|
|
|
// ------------------------------------------------------------------------------------------------
|
|
// Destructor, private as well
|
|
BaseProcess::~BaseProcess()
|
|
{
|
|
// nothing to do here
|
|
}
|
|
|
|
// ------------------------------------------------------------------------------------------------
|
|
void BaseProcess::ExecuteOnScene( Importer* pImp)
|
|
{
|
|
ai_assert(NULL != pImp && NULL != pImp->Pimpl()->mScene);
|
|
|
|
progress = pImp->GetProgressHandler();
|
|
ai_assert(progress);
|
|
|
|
SetupProperties( pImp );
|
|
|
|
// catch exceptions thrown inside the PostProcess-Step
|
|
try
|
|
{
|
|
Execute(pImp->Pimpl()->mScene);
|
|
|
|
} catch( const std::exception& err ) {
|
|
|
|
// 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;
|
|
}
|
|
}
|
|
|
|
// ------------------------------------------------------------------------------------------------
|
|
void BaseProcess::SetupProperties(const Importer* /*pImp*/)
|
|
{
|
|
// the default implementation does nothing
|
|
}
|
|
|
|
// ------------------------------------------------------------------------------------------------
|
|
bool BaseProcess::RequireVerboseFormat() const
|
|
{
|
|
return true;
|
|
}
|
|
|