diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 60d0ef23e..f4c5dc52b 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -80,6 +80,8 @@ SET( PUBLIC_HEADERS ${HEADER_PATH}/vector2.inl ${HEADER_PATH}/vector3.h ${HEADER_PATH}/vector3.inl + ${HEADER_PATH}/vector4.h + ${HEADER_PATH}/vector4.inl ${HEADER_PATH}/version.h ${HEADER_PATH}/cimport.h ${HEADER_PATH}/importerdesc.h diff --git a/doc/architecture/Assimp_Arch_Import.class.violet.html b/doc/architecture/Assimp_Arch_Import.class.violet.html index a7ed8c6ce..264468f98 100644 --- a/doc/architecture/Assimp_Arch_Import.class.violet.html +++ b/doc/architecture/Assimp_Arch_Import.class.violet.html @@ -20,8 +20,8 @@ - - + + 1 255 @@ -37,620 +37,318 @@ - Assimpo::Exporter + Importer - aiScene* mScene; -IOSystem* mIOHandler; -struct ExportFormatEntry { - aiExportFormatDesc mDescription; - fpExportFunc mExportFunction; -}; - + - const aiExportDataBlob* ExportToBlob( const aiScene* pScene, ... ); -const aiExportDataBlob* ExportToBlob( const aiScene* pScene, ...); -aiReturn Export( const aiScene* pScene, ... ); -aiReturn Export( const aiScene* pScene, ...); - - + RegisterLoader() +UnregisterLoader() +ReadFile() - - - 1 - - 255 - 255 - 255 - 255 - - - 0 - 0 - 0 - 255 - - - - IOSystem - - - - - - bool Exists( const std::string& pFile) const; -bool Exists( const char* pFile) const; -virtual char getOsSeparator() const; - -virtual IOStream* Open(const char* pFile, - const char* pMode = "rb"); -IOStream* Open(const std::string& pFile, const std::string& pMode = std::string("rb")); -void Close( IOStream* pFile); - - - - - - - - + + 1 - - ObjExporter + + IOSystem - - File contains function pointer: -ExportSceneObj + + - + + + + + + 1 + + + + + BaseImporter + + + + + + CanRead() +InternRead() + + + + + + + 1 + + + + + ObjImporter + + + + + + CanRead() +InternRead() + + + + + + + 1 + + + + + glTFImporter + + + + + + CanRead() +InternRead() + + - - - - - - - - - 1 - - - - - - - - - 1 - - - - - - - - - 1 - - - - - - + + + + + + - + 1 - - - - - - - - + + + + + + + + + + + + 1 - - - - - - + + + + + + + + + + - + 1 - - - - - - - + + + + + + + 1 - - - - - - - - + + + + + + + + + + + + 1 - - - - - - - - - 1 - + + + + + ]]>

- embedded diagram image + embedded diagram image \ No newline at end of file diff --git a/packaging/windows-innosetup/script.iss b/packaging/windows-innosetup/script.iss index ce489c69e..f301bc4eb 100644 --- a/packaging/windows-innosetup/script.iss +++ b/packaging/windows-innosetup/script.iss @@ -87,15 +87,15 @@ Source: "..\..\include\*"; DestDir: "{app}\include"; Flags: recursesubdirs Source: "..\..\port\dAssimp\*"; DestDir: "{app}\port\D"; Flags: recursesubdirs; Components: dassimp ; Assimp.NET -Source: "..\..\port\Assimp.NET\*"; DestDir: "{app}\port\C#"; Flags: recursesubdirs; Components: assimp_net +;Source: "..\..\port\Assimp.NET\*"; DestDir: "{app}\port\C#"; Flags: recursesubdirs; Components: assimp_net ; PyAssimp -Source: "..\..\port\PyAssimp\*"; DestDir: "{app}\port\Python"; Excludes: "*.pyc,*.dll"; Flags: recursesubdirs; Components: pyassimp +;Source: "..\..\port\PyAssimp\*"; DestDir: "{app}\port\Python"; Excludes: "*.pyc,*.dll"; Flags: recursesubdirs; Components: pyassimp ; Test repository -Source: "..\..\test\models\*"; DestDir: "{app}\test\models"; Flags: recursesubdirs; Components: test -Source: "..\..\test\regression\*"; DestDir: "{app}\test\regression"; Flags: recursesubdirs; Components: test -Source: "..\..\test\models-nonbsd\*"; DestDir: "{app}\test\models-nonbsd"; Flags: recursesubdirs; Components: test_nonbsd +;Source: "..\..\test\models\*"; DestDir: "{app}\test\models"; Flags: recursesubdirs; Components: test +;Source: "..\..\test\regression\*"; DestDir: "{app}\test\regression"; Flags: recursesubdirs; Components: test +;Source: "..\..\test\models-nonbsd\*"; DestDir: "{app}\test\models-nonbsd"; Flags: recursesubdirs; Components: test_nonbsd ; Source Code & Workspaces ;Source: "..\..\code\*"; Excludes: "*.o"; DestDir: "{app}\code"; Flags: recursesubdirs; Components: wsource