Integration of config interface patch is nearly complete; Importer::GetMemoryRequirements() patch is in the repos.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@92 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2008-08-08 11:59:09 +00:00
parent 8844380f34
commit 30ecc82181
5 changed files with 32 additions and 73 deletions

View File

@@ -89,12 +89,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#if (!defined AI_BUILD_NO_SMD_IMPORTER)
# include "SMDLoader.h"
#endif
#if 0
#if (!defined AI_BUILD_NO_MDR_IMPORTER)
# include "MDRLoader.h"
#endif
#if (!defined AI_BUILD_NO_MDC_IMPORTER)
# include "MDCLoader.h"
#endif
#endif
#if (!defined AI_BUILD_NO_MD5_IMPORTER)
# include "MD5Loader.h"
#endif
@@ -199,12 +201,14 @@ Importer::Importer() :
#if (!defined AI_BUILD_NO_SMD_IMPORTER)
mImporter.push_back( new SMDImporter());
#endif
#if 0
#if (!defined AI_BUILD_NO_MDR_IMPORTER)
mImporter.push_back( new MDRImporter());
#endif
#if (!defined AI_BUILD_NO_MDC_IMPORTER)
mImporter.push_back( new MDCImporter());
#endif
#endif
#if (!defined AI_BUILD_NO_MD5_IMPORTER)
mImporter.push_back( new MD5Importer());
#endif
@@ -263,20 +267,20 @@ Importer::Importer() :
mPostProcessingSteps.push_back( new ImproveCacheLocalityProcess());
#endif
// store the *this* pointer in all BaseImporter instances
for (std::vector<BaseImporter*>::iterator
i = mImporter.begin();
i != mImporter.end();++i)
{
(**i).mImporter = this;
}
// store the *this* pointer in all BaseProcess instances
for (std::vector<BaseProcess*>::iterator
i = mPostProcessingSteps.begin();
i != mPostProcessingSteps.end();++i)
{
(**i).mImporter = this;
}
//// store the *this* pointer in all BaseImporter instances
//for (std::vector<BaseImporter*>::iterator
// i = mImporter.begin();
// i != mImporter.end();++i)
//{
// (**i).mImporter = this;
//}
//// store the *this* pointer in all BaseProcess instances
//for (std::vector<BaseProcess*>::iterator
// i = mPostProcessingSteps.begin();
// i != mPostProcessingSteps.end();++i)
//{
// (**i).mImporter = this;
//}
}
// ------------------------------------------------------------------------------------------------