diff options
Diffstat (limited to 'src/3rdparty/assimp/code/STLExporter.h')
| -rw-r--r-- | src/3rdparty/assimp/code/STLExporter.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/3rdparty/assimp/code/STLExporter.h b/src/3rdparty/assimp/code/STLExporter.h index 71f065762..44b12344f 100644 --- a/src/3rdparty/assimp/code/STLExporter.h +++ b/src/3rdparty/assimp/code/STLExporter.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. ---------------------------------------------------------------------- @@ -48,8 +48,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. struct aiScene; struct aiNode; +struct aiMesh; -namespace Assimp +namespace Assimp { // ------------------------------------------------------------------------------------------------ @@ -58,26 +59,25 @@ namespace Assimp class STLExporter { public: - /// Constructor for a specific scene to export - STLExporter(const char* filename, const aiScene* pScene, bool binary = false); + /// Constructor for a specific scene to export + STLExporter(const char* filename, const aiScene* pScene, bool binary = false); public: - /// public stringstreams to write all output into - std::ostringstream mOutput; + /// public stringstreams to write all output into + std::ostringstream mOutput; private: - void WriteMesh(const aiMesh* m); - void WriteMeshBinary(const aiMesh* m); + void WriteMesh(const aiMesh* m); + void WriteMeshBinary(const aiMesh* m); private: - const std::string filename; - const aiScene* const pScene; + const std::string filename; - // this endl() doesn't flush() the stream - const std::string endl; + // this endl() doesn't flush() the stream + const std::string endl; }; } |