diff options
Diffstat (limited to 'src/3rdparty/assimp/code/Q3DLoader.h')
| -rw-r--r-- | src/3rdparty/assimp/code/Q3DLoader.h | 139 |
1 files changed, 70 insertions, 69 deletions
diff --git a/src/3rdparty/assimp/code/Q3DLoader.h b/src/3rdparty/assimp/code/Q3DLoader.h index 986630406..fb1dd1818 100644 --- a/src/3rdparty/assimp/code/Q3DLoader.h +++ b/src/3rdparty/assimp/code/Q3DLoader.h @@ -2,11 +2,11 @@ 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 +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 @@ -23,16 +23,16 @@ following 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. ---------------------------------------------------------------------- @@ -45,10 +45,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_Q3DLOADER_H_INCLUDED #include "BaseImporter.h" -#include "../include/assimp/types.h" +#include <assimp/types.h> #include <vector> +#include <stdint.h> -namespace Assimp { +namespace Assimp { // --------------------------------------------------------------------------- /** Importer class for the Quick3D Object and Scene formats. @@ -56,74 +57,74 @@ namespace Assimp { class Q3DImporter : public BaseImporter { public: - Q3DImporter(); - ~Q3DImporter(); + Q3DImporter(); + ~Q3DImporter(); public: - // ------------------------------------------------------------------- - /** Returns whether the class can handle the format of the given file. - * See BaseImporter::CanRead() for details. */ - bool CanRead( const std::string& pFile, IOSystem* pIOHandler, - bool checkSig) const; + // ------------------------------------------------------------------- + /** Returns whether the class can handle the format of the given file. + * See BaseImporter::CanRead() for details. */ + bool CanRead( const std::string& pFile, IOSystem* pIOHandler, + bool checkSig) const; protected: - // ------------------------------------------------------------------- - /** Return importer meta information. - * See #BaseImporter::GetInfo for the details - */ - const aiImporterDesc* GetInfo () const; + // ------------------------------------------------------------------- + /** Return importer meta information. + * See #BaseImporter::GetInfo for the details + */ + const aiImporterDesc* GetInfo () const; - // ------------------------------------------------------------------- - /** Imports the given file into the given scene structure. - * See BaseImporter::InternReadFile() for details - */ - void InternReadFile( const std::string& pFile, aiScene* pScene, - IOSystem* pIOHandler); + // ------------------------------------------------------------------- + /** Imports the given file into the given scene structure. + * See BaseImporter::InternReadFile() for details + */ + void InternReadFile( const std::string& pFile, aiScene* pScene, + IOSystem* pIOHandler); private: - struct Material - { - Material() - : diffuse (0.6f,0.6f,0.6f) - , transparency (0.f) - , texIdx (UINT_MAX) - {} - - aiString name; - aiColor3D ambient, diffuse, specular; - float transparency; - - unsigned int texIdx; - }; - - struct Face - { - Face(unsigned int s) - : indices (s) - , uvindices (s) - , mat (0) - { - } - - std::vector<unsigned int> indices; - std::vector<unsigned int> uvindices; - unsigned int mat; - }; - - struct Mesh - { - - std::vector<aiVector3D> verts; - std::vector<aiVector3D> normals; - std::vector<aiVector3D> uv; - std::vector<Face> faces; - - uint32_t prevUVIdx; - }; + struct Material + { + Material() + : diffuse (0.6f,0.6f,0.6f) + , transparency (0.f) + , texIdx (UINT_MAX) + {} + + aiString name; + aiColor3D ambient, diffuse, specular; + float transparency; + + unsigned int texIdx; + }; + + struct Face + { + explicit Face(unsigned int s) + : indices (s) + , uvindices (s) + , mat (0) + { + } + + std::vector<unsigned int> indices; + std::vector<unsigned int> uvindices; + unsigned int mat; + }; + + struct Mesh + { + + std::vector<aiVector3D> verts; + std::vector<aiVector3D> normals; + std::vector<aiVector3D> uv; + std::vector<Face> faces; + + uint32_t prevUVIdx; + }; }; } // end of namespace Assimp |