summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/assimp/code/D3MFOpcPackage.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/assimp/code/D3MFOpcPackage.h')
-rw-r--r--src/3rdparty/assimp/code/D3MFOpcPackage.h23
1 files changed, 14 insertions, 9 deletions
diff --git a/src/3rdparty/assimp/code/D3MFOpcPackage.h b/src/3rdparty/assimp/code/D3MFOpcPackage.h
index dd8a40aab..818415e9f 100644
--- a/src/3rdparty/assimp/code/D3MFOpcPackage.h
+++ b/src/3rdparty/assimp/code/D3MFOpcPackage.h
@@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2016, assimp team
+Copyright (c) 2006-2017, assimp team
+
All rights reserved.
Redistribution and use of this software in source and binary forms,
@@ -41,33 +42,37 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef D3MFOPCPACKAGE_H
#define D3MFOPCPACKAGE_H
-#include <string>
#include <memory>
#include <assimp/IOSystem.hpp>
#include "irrXMLWrapper.h"
namespace Assimp {
-
namespace D3MF {
typedef irr::io::IrrXMLReader XmlReader;
typedef std::shared_ptr<XmlReader> XmlReaderPtr;
+struct OpcPackageRelationship {
+ std::string id;
+ std::string type;
+ std::string target;
+};
+
class D3MFZipArchive;
-class D3MFOpcPackage
-{
+class D3MFOpcPackage {
public:
D3MFOpcPackage(IOSystem* pIOHandler, const std::string& rFile);
~D3MFOpcPackage();
-
IOStream* RootStream() const;
-private:
+
+protected:
std::string ReadPackageRootRelationship(IOStream* stream);
+
private:
- IOStream* m_RootStream;
- std::unique_ptr<D3MFZipArchive> zipArchive;
+ IOStream* mRootStream;
+ std::unique_ptr<D3MFZipArchive> mZipArchive;
};
}