Added temporary boost workaround - some assimp features work with reduced functionality in this case.
Added AC-loader, WIP version. PLY loader is now able to load models from blender, test model added. Refactoring. Added FindInvalidData step. Added support for precompiled headers, the release builds in VC8 are configued to use PCH now. Added separate makefile for mingw, no -FPic warning anymore, -clear works now. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@176 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
@@ -57,7 +57,6 @@ namespace Assimp {
|
||||
|
||||
// **********************************************************
|
||||
// Java: ConfigProperty.java,
|
||||
// ConfigProperty.OG_MAX_HIERARCHY_DEPTH
|
||||
// ConfigProperty.OG_MIN_NUM_FACES
|
||||
// ConfigProperty.JOIN_INEQUAL_TRANSFORMS
|
||||
// **********************************************************
|
||||
@@ -70,10 +69,6 @@ namespace Assimp {
|
||||
# define AI_OG_MIN_NUM_FACES 0xffffffff
|
||||
#endif // !! AI_LMW_MAX_WEIGHTS
|
||||
|
||||
#if (!defined AI_OG_REMOVE_ANIMATIONS)
|
||||
# define AI_OG_REMOVE_ANIMATIONS false
|
||||
#endif // !! AI_LMW_MAX_WEIGHTS
|
||||
|
||||
#if (!defined AI_OG_JOIN_INEQUAL_TRANSFORMS)
|
||||
# define AI_OG_JOIN_INEQUAL_TRANSFORMS false
|
||||
#endif // !! AI_LMW_MAX_WEIGHTS
|
||||
@@ -152,12 +147,6 @@ public:
|
||||
configMinNumFaces = n;
|
||||
}
|
||||
|
||||
// set the configRemoveAnimations property
|
||||
inline void SetRemoveAnimations(bool b)
|
||||
{
|
||||
configRemoveAnimations = b;
|
||||
}
|
||||
|
||||
|
||||
protected:
|
||||
|
||||
@@ -178,14 +167,6 @@ protected:
|
||||
void RemoveAnimationNodes (aiNode* node,std::vector<aiNode*>& out);
|
||||
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
/** Entry point to the RemoveAnimationNodes algorithm.
|
||||
* @param node Root node to start with
|
||||
* @return New root node
|
||||
*/
|
||||
aiNode* RemoveAnimationNodes (aiNode* node);
|
||||
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
/** Finds and marks all locked nodes in the tree.
|
||||
* A node is locked if it is referenced by animations.
|
||||
@@ -309,12 +290,6 @@ private:
|
||||
unsigned int configMinNumFaces;
|
||||
|
||||
|
||||
/** Configuration option: specifies whether animations are removed
|
||||
from the node graph. If animations aren't needed by the caller,
|
||||
this allows for further optimization.
|
||||
*/
|
||||
bool configRemoveAnimations;
|
||||
|
||||
/** Configuration option: specifies whether nodes with inequal
|
||||
world matrices are joined if they are on the same hierarchy
|
||||
level and if it seems to make sense.
|
||||
|
||||
Reference in New Issue
Block a user