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