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-9d2fd5bffc1fpull/1/head
parent
8844380f34
commit
30ecc82181
|
@ -89,12 +89,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#if (!defined AI_BUILD_NO_SMD_IMPORTER)
|
#if (!defined AI_BUILD_NO_SMD_IMPORTER)
|
||||||
# include "SMDLoader.h"
|
# include "SMDLoader.h"
|
||||||
#endif
|
#endif
|
||||||
|
#if 0
|
||||||
#if (!defined AI_BUILD_NO_MDR_IMPORTER)
|
#if (!defined AI_BUILD_NO_MDR_IMPORTER)
|
||||||
# include "MDRLoader.h"
|
# include "MDRLoader.h"
|
||||||
#endif
|
#endif
|
||||||
#if (!defined AI_BUILD_NO_MDC_IMPORTER)
|
#if (!defined AI_BUILD_NO_MDC_IMPORTER)
|
||||||
# include "MDCLoader.h"
|
# include "MDCLoader.h"
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
#if (!defined AI_BUILD_NO_MD5_IMPORTER)
|
#if (!defined AI_BUILD_NO_MD5_IMPORTER)
|
||||||
# include "MD5Loader.h"
|
# include "MD5Loader.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -199,12 +201,14 @@ Importer::Importer() :
|
||||||
#if (!defined AI_BUILD_NO_SMD_IMPORTER)
|
#if (!defined AI_BUILD_NO_SMD_IMPORTER)
|
||||||
mImporter.push_back( new SMDImporter());
|
mImporter.push_back( new SMDImporter());
|
||||||
#endif
|
#endif
|
||||||
|
#if 0
|
||||||
#if (!defined AI_BUILD_NO_MDR_IMPORTER)
|
#if (!defined AI_BUILD_NO_MDR_IMPORTER)
|
||||||
mImporter.push_back( new MDRImporter());
|
mImporter.push_back( new MDRImporter());
|
||||||
#endif
|
#endif
|
||||||
#if (!defined AI_BUILD_NO_MDC_IMPORTER)
|
#if (!defined AI_BUILD_NO_MDC_IMPORTER)
|
||||||
mImporter.push_back( new MDCImporter());
|
mImporter.push_back( new MDCImporter());
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
#if (!defined AI_BUILD_NO_MD5_IMPORTER)
|
#if (!defined AI_BUILD_NO_MD5_IMPORTER)
|
||||||
mImporter.push_back( new MD5Importer());
|
mImporter.push_back( new MD5Importer());
|
||||||
#endif
|
#endif
|
||||||
|
@ -263,20 +267,20 @@ Importer::Importer() :
|
||||||
mPostProcessingSteps.push_back( new ImproveCacheLocalityProcess());
|
mPostProcessingSteps.push_back( new ImproveCacheLocalityProcess());
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// store the *this* pointer in all BaseImporter instances
|
//// store the *this* pointer in all BaseImporter instances
|
||||||
for (std::vector<BaseImporter*>::iterator
|
//for (std::vector<BaseImporter*>::iterator
|
||||||
i = mImporter.begin();
|
// i = mImporter.begin();
|
||||||
i != mImporter.end();++i)
|
// i != mImporter.end();++i)
|
||||||
{
|
//{
|
||||||
(**i).mImporter = this;
|
// (**i).mImporter = this;
|
||||||
}
|
//}
|
||||||
// store the *this* pointer in all BaseProcess instances
|
//// store the *this* pointer in all BaseProcess instances
|
||||||
for (std::vector<BaseProcess*>::iterator
|
//for (std::vector<BaseProcess*>::iterator
|
||||||
i = mPostProcessingSteps.begin();
|
// i = mPostProcessingSteps.begin();
|
||||||
i != mPostProcessingSteps.end();++i)
|
// i != mPostProcessingSteps.end();++i)
|
||||||
{
|
//{
|
||||||
(**i).mImporter = this;
|
// (**i).mImporter = this;
|
||||||
}
|
//}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------------------------
|
||||||
|
|
|
@ -63,6 +63,9 @@ struct aiQuaternion
|
||||||
/** Construct from euler angles */
|
/** Construct from euler angles */
|
||||||
aiQuaternion( float rotx, float roty, float rotz);
|
aiQuaternion( float rotx, float roty, float rotz);
|
||||||
|
|
||||||
|
/** Construct from an axis-angle pair */
|
||||||
|
aiQuaternion( aiVector3D axis, float angle);
|
||||||
|
|
||||||
/** Construct from a normalized quaternion stored in a vec3 */
|
/** Construct from a normalized quaternion stored in a vec3 */
|
||||||
aiQuaternion( aiVector3D normalized);
|
aiQuaternion( aiVector3D normalized);
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
// public ASSIMP headers
|
// public ASSIMP headers
|
||||||
#include "aiDefines.h"
|
#include "aiTypes.h"
|
||||||
#include "aiConfig.h"
|
#include "aiConfig.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -2089,8 +2089,8 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
|
||||||
return -4;
|
return -4;
|
||||||
}
|
}
|
||||||
// setup ASSIMP standard limits for the SplitLargeMeshes-process
|
// setup ASSIMP standard limits for the SplitLargeMeshes-process
|
||||||
aiSetTriangleSplitLimit(g_sCaps.MaxPrimitiveCount-1);
|
// aiSetTriangleSplitLimit(g_sCaps.MaxPrimitiveCount-1);
|
||||||
aiSetVertexSplitLimit(0xFFFFFFFF);
|
// aiSetVertexSplitLimit(0xFFFFFFFF);
|
||||||
|
|
||||||
CLogDisplay::Instance().AddEntry("[OK] The viewer has been initialized successfully");
|
CLogDisplay::Instance().AddEntry("[OK] The viewer has been initialized successfully");
|
||||||
|
|
||||||
|
|
|
@ -722,6 +722,10 @@
|
||||||
RelativePath="..\..\code\fast_atof.h"
|
RelativePath="..\..\code\fast_atof.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\code\FixNormalsStep.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\code\GenFaceNormalsProcess.h"
|
RelativePath="..\..\code\GenFaceNormalsProcess.h"
|
||||||
>
|
>
|
||||||
|
@ -974,46 +978,6 @@
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
</Filter>
|
</Filter>
|
||||||
<Filter
|
|
||||||
Name="jAssimp"
|
|
||||||
>
|
|
||||||
<File
|
|
||||||
RelativePath="..\..\port\jAssimp\jni_bridge\assimp_Importer.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\..\port\jAssimp\jni_bridge\assimp_Material.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\..\port\jAssimp\jni_bridge\jAssimp\assimp_Mesh.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\..\port\jAssimp\jni_bridge\jAssimp\assimp_Node.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\..\port\jAssimp\jni_bridge\assimp_PostProcessStep.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\..\port\jAssimp\jni_bridge\assimp_Scene.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\..\port\jAssimp\jni_bridge\assimp_Texture.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\..\port\jAssimp\jni_bridge\JNIEnvironment.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\..\port\jAssimp\jni_bridge\JNILogger.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
</Filter>
|
|
||||||
<Filter
|
<Filter
|
||||||
Name="extra"
|
Name="extra"
|
||||||
>
|
>
|
||||||
|
@ -1090,6 +1054,10 @@
|
||||||
RelativePath="..\..\code\DefaultIOSystem.cpp"
|
RelativePath="..\..\code\DefaultIOSystem.cpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\code\FixNormalsStep.cpp"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\code\GenFaceNormalsProcess.cpp"
|
RelativePath="..\..\code\GenFaceNormalsProcess.cpp"
|
||||||
>
|
>
|
||||||
|
@ -1274,22 +1242,6 @@
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
</Filter>
|
</Filter>
|
||||||
<Filter
|
|
||||||
Name="jAssimp"
|
|
||||||
>
|
|
||||||
<File
|
|
||||||
RelativePath="..\..\port\jAssimp\jni_bridge\JNICalls.cpp"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\..\port\jAssimp\jni_bridge\JNIEnvironment.cpp"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\..\port\jAssimp\jni_bridge\JNILogger.cpp"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
</Filter>
|
|
||||||
<Filter
|
<Filter
|
||||||
Name="extra"
|
Name="extra"
|
||||||
>
|
>
|
||||||
|
|
Loading…
Reference in New Issue