From 386128febcbf5eee5a0caf2de33d91450d350b7e Mon Sep 17 00:00:00 2001 From: Alexandr Arutjunov Date: Mon, 26 Sep 2016 12:57:44 +0300 Subject: [PATCH] [+] Building AMF-importer. --- code/CMakeLists.txt | 12 +++++++++++- code/ImporterRegistry.cpp | 8 +++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index b1e0256ca..0320ecd70 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -1,4 +1,4 @@ -# Open Asset Import Library (assimp) +# Open Asset Import Library (assimp) # ---------------------------------------------------------------------- # # Copyright (c) 2006-2016, assimp team @@ -202,6 +202,16 @@ SET(ASSIMP_LOADER_SRCS "") SET(ASSIMP_IMPORTERS_ENABLED "") # list of enabled importers SET(ASSIMP_IMPORTERS_DISABLED "") # disabled list (used to print) +ADD_ASSIMP_IMPORTER( AMF + AMFImporter.hpp + AMFImporter_Macro.hpp + AMFImporter_Node.hpp + AMFImporter.cpp + AMFImporter_Geometry.cpp + AMFImporter_Material.cpp + AMFImporter_Postprocess.cpp +) + ADD_ASSIMP_IMPORTER( 3DS 3DSConverter.cpp 3DSHelper.h diff --git a/code/ImporterRegistry.cpp b/code/ImporterRegistry.cpp index d6a175963..af56f0674 100644 --- a/code/ImporterRegistry.cpp +++ b/code/ImporterRegistry.cpp @@ -1,4 +1,4 @@ -/* +/* --------------------------------------------------------------------------- Open Asset Import Library (assimp) --------------------------------------------------------------------------- @@ -53,6 +53,9 @@ corresponding preprocessor flag to selectively disable formats. #ifndef ASSIMP_BUILD_NO_X_IMPORTER # include "XFileImporter.h" #endif +#ifndef ASSIMP_BUILD_NO_AMF_IMPORTER +# include "AMFImporter.hpp" +#endif #ifndef ASSIMP_BUILD_NO_3DS_IMPORTER # include "3DSLoader.h" #endif @@ -199,6 +202,9 @@ void GetImporterInstanceList(std::vector< BaseImporter* >& out) #if (!defined ASSIMP_BUILD_NO_OBJ_IMPORTER) out.push_back( new ObjFileImporter()); #endif +#ifndef ASSIMP_BUILD_NO_AMF_IMPORTER + out.push_back( new AMFImporter() ); +#endif #if (!defined ASSIMP_BUILD_NO_3DS_IMPORTER) out.push_back( new Discreet3DSImporter()); #endif