v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into fixJoinVerticesProcess

pull/4872/head
Kim Kulling 2023-01-17 09:11:43 +01:00 committed by GitHub
parent 74af523b3e 70edec0efb
commit 19dec716d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/AssetLib/FBX/FBXTokenizer.h
View File

@ -154,7 +154,6 @@ private:
const unsigned int column; const unsigned int column;
}; };
// XXX should use C++11's unique_ptr - but assimp's need to keep working with 03
typedef const Token* TokenPtr; typedef const Token* TokenPtr;
typedef std::vector< TokenPtr > TokenList; typedef std::vector< TokenPtr > TokenList;

9
include/assimp/mesh.h
View File

@ -566,6 +566,9 @@ struct aiAnimMesh {
/** @brief Enumerates the methods of mesh morphing supported by Assimp. /** @brief Enumerates the methods of mesh morphing supported by Assimp.
*/ */
enum aiMorphingMethod { enum aiMorphingMethod {
/** Morphing method to be determined */
aiMorphingMethod_UNKNOWN = 0x0,
/** Interpolation between morph targets */ /** Interpolation between morph targets */
aiMorphingMethod_VERTEX_BLEND = 0x1, aiMorphingMethod_VERTEX_BLEND = 0x1,
@ -747,7 +750,7 @@ struct aiMesh {
* Method of morphing when anim-meshes are specified. * Method of morphing when anim-meshes are specified.
* @see aiMorphingMethod to learn more about the provided morphing targets. * @see aiMorphingMethod to learn more about the provided morphing targets.
*/ */
unsigned int mMethod; enum aiMorphingMethod mMethod;
/** /**
* The bounding box. * The bounding box.
@ -778,7 +781,7 @@ struct aiMesh {
mMaterialIndex(0), mMaterialIndex(0),
mNumAnimMeshes(0), mNumAnimMeshes(0),
mAnimMeshes(nullptr), mAnimMeshes(nullptr),
mMethod(0), mMethod(aiMorphingMethod_UNKNOWN),
mAABB(), mAABB(),
mTextureCoordsNames(nullptr) { mTextureCoordsNames(nullptr) {
for (unsigned int a = 0; a < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++a) { for (unsigned int a = 0; a < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++a) {
@ -1002,7 +1005,7 @@ struct aiSkeletonBone {
#endif // __cplusplus #endif // __cplusplus
}; };
/** /**
* @brief * @brief
*/ */
struct aiSkeleton { struct aiSkeleton {
/** /**