diff options
Diffstat (limited to 'src/3rdparty/assimp/code/OgreXmlSerializer.h')
| -rw-r--r-- | src/3rdparty/assimp/code/OgreXmlSerializer.h | 118 |
1 files changed, 59 insertions, 59 deletions
diff --git a/src/3rdparty/assimp/code/OgreXmlSerializer.h b/src/3rdparty/assimp/code/OgreXmlSerializer.h index 62257f81c..47b4cafc0 100644 --- a/src/3rdparty/assimp/code/OgreXmlSerializer.h +++ b/src/3rdparty/assimp/code/OgreXmlSerializer.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. ---------------------------------------------------------------------- @@ -52,61 +52,61 @@ namespace Ogre { typedef irr::io::IrrXMLReader XmlReader; -typedef boost::shared_ptr<XmlReader> XmlReaderPtr; +typedef std::shared_ptr<XmlReader> XmlReaderPtr; class OgreXmlSerializer { public: - /// Imports mesh and returns the result. - /** @note Fatal unrecoverable errors will throw a DeadlyImportError. */ - static MeshXml *ImportMesh(XmlReader *reader); - - /// Imports skeleton to @c mesh. - /** If mesh does not have a skeleton reference or the skeleton file - cannot be found it is not a fatal DeadlyImportError. - @return If skeleton import was successful. */ - static bool ImportSkeleton(Assimp::IOSystem *pIOHandler, MeshXml *mesh); - static bool ImportSkeleton(Assimp::IOSystem *pIOHandler, Mesh *mesh); + /// Imports mesh and returns the result. + /** @note Fatal unrecoverable errors will throw a DeadlyImportError. */ + static MeshXml *ImportMesh(XmlReader *reader); + + /// Imports skeleton to @c mesh. + /** If mesh does not have a skeleton reference or the skeleton file + cannot be found it is not a fatal DeadlyImportError. + @return If skeleton import was successful. */ + static bool ImportSkeleton(Assimp::IOSystem *pIOHandler, MeshXml *mesh); + static bool ImportSkeleton(Assimp::IOSystem *pIOHandler, Mesh *mesh); private: - OgreXmlSerializer(XmlReader *reader) : - m_reader(reader) - { - } - - static XmlReaderPtr OpenReader(Assimp::IOSystem *pIOHandler, const std::string &filename); - - // Mesh - void ReadMesh(MeshXml *mesh); - void ReadSubMesh(MeshXml *mesh); - - void ReadGeometry(VertexDataXml *dest); - void ReadGeometryVertexBuffer(VertexDataXml *dest); - - void ReadBoneAssignments(VertexDataXml *dest); - - // Skeleton - void ReadSkeleton(Skeleton *skeleton); - - void ReadBones(Skeleton *skeleton); - void ReadBoneHierarchy(Skeleton *skeleton); - - void ReadAnimations(Skeleton *skeleton); - void ReadAnimationTracks(Animation *dest); - void ReadAnimationKeyFrames(Animation *anim, VertexAnimationTrack *dest); - - template<typename T> - T ReadAttribute(const std::string &name) const; - bool HasAttribute(const std::string &name) const; - - std::string &NextNode(); - std::string &SkipCurrentNode(); - - bool CurrentNodeNameEquals(const std::string &name) const; - std::string CurrentNodeName(bool forceRead = false); - - XmlReader *m_reader; - std::string m_currentNodeName; + explicit OgreXmlSerializer(XmlReader *reader) : + m_reader(reader) + { + } + + static XmlReaderPtr OpenReader(Assimp::IOSystem *pIOHandler, const std::string &filename); + + // Mesh + void ReadMesh(MeshXml *mesh); + void ReadSubMesh(MeshXml *mesh); + + void ReadGeometry(VertexDataXml *dest); + void ReadGeometryVertexBuffer(VertexDataXml *dest); + + void ReadBoneAssignments(VertexDataXml *dest); + + // Skeleton + void ReadSkeleton(Skeleton *skeleton); + + void ReadBones(Skeleton *skeleton); + void ReadBoneHierarchy(Skeleton *skeleton); + + void ReadAnimations(Skeleton *skeleton); + void ReadAnimationTracks(Animation *dest); + void ReadAnimationKeyFrames(Animation *anim, VertexAnimationTrack *dest); + + template<typename T> + T ReadAttribute(const std::string &name) const; + bool HasAttribute(const std::string &name) const; + + std::string &NextNode(); + std::string &SkipCurrentNode(); + + bool CurrentNodeNameEquals(const std::string &name) const; + std::string CurrentNodeName(bool forceRead = false); + + XmlReader *m_reader; + std::string m_currentNodeName; }; } // Ogre |