diff options
Diffstat (limited to 'src/3rdparty/assimp/code/SortByPTypeProcess.h')
-rw-r--r-- | src/3rdparty/assimp/code/SortByPTypeProcess.h | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/3rdparty/assimp/code/SortByPTypeProcess.h b/src/3rdparty/assimp/code/SortByPTypeProcess.h index 455215f03..f96985cb3 100644 --- a/src/3rdparty/assimp/code/SortByPTypeProcess.h +++ b/src/3rdparty/assimp/code/SortByPTypeProcess.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,58 +23,58 @@ 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. ---------------------------------------------------------------------- */ -/** @file Defines a post processing step to sort meshes by the types +/** @file Defines a post processing step to sort meshes by the types of primitives they contain */ #ifndef AI_SORTBYPTYPEPROCESS_H_INC #define AI_SORTBYPTYPEPROCESS_H_INC #include "BaseProcess.h" -#include "../include/assimp/mesh.h" +#include <assimp/mesh.h> class SortByPTypeProcessTest; -namespace Assimp { +namespace Assimp { // --------------------------------------------------------------------------- /** SortByPTypeProcess: Sorts meshes by the types of primitives they contain. - * A mesh with 5 lines, 3 points and 145 triangles would be split in 3 + * A mesh with 5 lines, 3 points and 145 triangles would be split in 3 * submeshes. */ class ASSIMP_API SortByPTypeProcess : public BaseProcess { public: - SortByPTypeProcess(); - ~SortByPTypeProcess(); + SortByPTypeProcess(); + ~SortByPTypeProcess(); public: - // ------------------------------------------------------------------- - bool IsActive( unsigned int pFlags) const; + // ------------------------------------------------------------------- + bool IsActive( unsigned int pFlags) const; - // ------------------------------------------------------------------- - void Execute( aiScene* pScene); + // ------------------------------------------------------------------- + void Execute( aiScene* pScene); - // ------------------------------------------------------------------- - void SetupProperties(const Importer* pImp); + // ------------------------------------------------------------------- + void SetupProperties(const Importer* pImp); private: - int configRemoveMeshes; + int configRemoveMeshes; }; |