diff options
Diffstat (limited to 'src/3rdparty/assimp/include/assimp/Importer.hpp')
| -rw-r--r-- | src/3rdparty/assimp/include/assimp/Importer.hpp | 42 |
1 files changed, 17 insertions, 25 deletions
diff --git a/src/3rdparty/assimp/include/assimp/Importer.hpp b/src/3rdparty/assimp/include/assimp/Importer.hpp index 4c01367ed..f42a2deaf 100644 --- a/src/3rdparty/assimp/include/assimp/Importer.hpp +++ b/src/3rdparty/assimp/include/assimp/Importer.hpp @@ -3,7 +3,8 @@ Open Asset Import Library (assimp) --------------------------------------------------------------------------- -Copyright (c) 2006-2016, assimp team +Copyright (c) 2006-2017, assimp team + All rights reserved. @@ -42,22 +43,21 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** @file Importer.hpp * @brief Defines the C++-API to the Open Asset Import Library. */ -#ifndef INCLUDED_AI_ASSIMP_HPP -#define INCLUDED_AI_ASSIMP_HPP +#pragma once +#ifndef AI_ASSIMP_HPP_INC +#define AI_ASSIMP_HPP_INC #ifndef __cplusplus # error This header requires C++ to be used. Use assimp.h for plain C. -#endif +#endif // __cplusplus // Public ASSIMP data structures -#include "types.h" -#include "config.h" +#include <assimp/types.h> namespace Assimp { // ======================================================================= // Public interface to Assimp class Importer; - class Exporter; // export.hpp class IOStream; class IOSystem; class ProgressHandler; @@ -76,7 +76,6 @@ namespace Assimp { // ======================================================================= // Holy stuff, only for members of the high council of the Jedi. class ImporterPimpl; - class ExporterPimpl; // export.hpp } //! namespace Assimp #define AI_PROPERTY_WAS_NOT_EXISTING 0xffffffff @@ -118,7 +117,7 @@ public: /** * @brief The upper limit for hints. */ - static const unsigned int MaxLenHint = 200; + static const unsigned int MaxLenHint = 200; public: @@ -192,7 +191,6 @@ public: */ aiReturn UnregisterPPStep(BaseProcess* pImp); - // ------------------------------------------------------------------- /** Set an integer configuration property. * @param szName Name of the property. All supported properties @@ -223,7 +221,7 @@ public: /** Set a floating-point configuration property. * @see SetPropertyInteger() */ - bool SetPropertyFloat(const char* szName, float fValue); + bool SetPropertyFloat(const char* szName, ai_real fValue); // ------------------------------------------------------------------- /** Set a string configuration property. @@ -268,8 +266,8 @@ public: /** Get a floating-point configuration property * @see GetPropertyInteger() */ - float GetPropertyFloat(const char* szName, - float fErrorReturn = 10e10f) const; + ai_real GetPropertyFloat(const char* szName, + ai_real fErrorReturn = 10e10) const; // ------------------------------------------------------------------- /** Get a string configuration property @@ -291,10 +289,10 @@ public: // ------------------------------------------------------------------- /** Supplies a custom IO handler to the importer to use to open and - * access files. If you need the importer to use custion IO logic to + * access files. If you need the importer to use custom IO logic to * access the files, you need to provide a custom implementation of * IOSystem and IOFile to the importer. Then create an instance of - * your custion IOSystem implementation and supply it by this function. + * your custom IOSystem implementation and supply it by this function. * * The Importer takes ownership of the object and will destroy it * afterwards. The previously assigned handler will be deleted. @@ -356,7 +354,7 @@ public: bool IsDefaultProgressHandler() const; // ------------------------------------------------------------------- - /** @brief Check whether a given set of postprocessing flags + /** @brief Check whether a given set of post-processing flags * is supported. * * Some flags are mutually exclusive, others are probably @@ -516,9 +514,6 @@ public: * It will work as well for static linkage with Assimp.*/ aiScene* GetOrphanedScene(); - - - // ------------------------------------------------------------------- /** Returns whether a given file extension is supported by ASSIMP. * @@ -557,7 +552,7 @@ public: inline void GetExtensionList(std::string& szOut) const; // ------------------------------------------------------------------- - /** Get the number of importrs currently registered with Assimp. */ + /** Get the number of importers currently registered with Assimp. */ size_t GetImporterCount() const; // ------------------------------------------------------------------- @@ -600,9 +595,6 @@ public: * @return (size_t)-1 if no importer is found */ size_t GetImporterIndex (const char* szExtension) const; - - - // ------------------------------------------------------------------- /** Returns the storage allocated by ASSIMP to hold the scene data * in memory. @@ -623,7 +615,6 @@ public: * intended for use in production environments. */ void SetExtraVerbose(bool bDo); - // ------------------------------------------------------------------- /** Private, do not use. */ ImporterPimpl* Pimpl() { return pimpl; } @@ -658,4 +649,5 @@ AI_FORCE_INLINE bool Importer::IsExtensionSupported(const std::string& szExtensi } } // !namespace Assimp -#endif // INCLUDED_AI_ASSIMP_HPP + +#endif // AI_ASSIMP_HPP_INC |