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

Adapt code style - finally :-).

pull/3375/head
Kim Kulling 2020-09-14 08:43:31 +02:00 committed by GitHub
parent 1ff9e2b522
commit 0e9621012c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
code/Common/Importer.h
View File

@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
Copyright (c) 2006-2020, assimp team Copyright (c) 2006-2020, assimp team
All rights reserved. All rights reserved.
Redistribution and use of this software in source and binary forms, Redistribution and use of this software in source and binary forms,
@ -128,27 +127,26 @@ public:
}; };
inline inline
ImporterPimpl::ImporterPimpl() AI_NO_EXCEPT ImporterPimpl::ImporterPimpl() AI_NO_EXCEPT :
: mIOHandler( nullptr ) mIOHandler( nullptr ),
, mIsDefaultHandler( false ) mIsDefaultHandler( false ),
, mProgressHandler( nullptr ) mProgressHandler( nullptr ),
, mIsDefaultProgressHandler( false ) mIsDefaultProgressHandler( false ),
, mImporter() mImporter(),
, mPostProcessingSteps() mPostProcessingSteps(),
, mScene( nullptr ) mScene( nullptr ),
, mErrorString() mErrorString(),
, mException() mException(),
, mIntProperties() mIntProperties(),
, mFloatProperties() mFloatProperties(),
, mStringProperties() mStringProperties(),
, mMatrixProperties() mMatrixProperties(),
, bExtraVerbose( false ) bExtraVerbose( false ),
, mPPShared( nullptr ) { mPPShared( nullptr ) {
// empty // empty
} }
//! @endcond //! @endcond
struct BatchData; struct BatchData;
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@ -159,17 +157,13 @@ struct BatchData;
* could, this has not yet been implemented at the moment). * could, this has not yet been implemented at the moment).
* *
* @note The class may not be used by more than one thread*/ * @note The class may not be used by more than one thread*/
class ASSIMP_API BatchLoader class ASSIMP_API BatchLoader {
{
// friend of Importer
public: public:
//! @cond never //! @cond never
// ------------------------------------------------------------------- // -------------------------------------------------------------------
/** Wraps a full list of configuration properties for an importer. /** Wraps a full list of configuration properties for an importer.
* Properties can be set using SetGenericProperty */ * Properties can be set using SetGenericProperty */
struct PropertyMap struct PropertyMap {
{
ImporterPimpl::IntPropertyMap ints; ImporterPimpl::IntPropertyMap ints;
ImporterPimpl::FloatPropertyMap floats; ImporterPimpl::FloatPropertyMap floats;
ImporterPimpl::StringPropertyMap strings; ImporterPimpl::StringPropertyMap strings;
@ -186,7 +180,6 @@ public:
}; };
//! @endcond //! @endcond
public:
// ------------------------------------------------------------------- // -------------------------------------------------------------------
/** Construct a batch loader from a given IO system to be used /** Construct a batch loader from a given IO system to be used
* to access external files * to access external files