Skip to content

Commit

Permalink
Merge pull request assimp#4873 from tellypresence/improve-mMethod-typing
Browse files Browse the repository at this point in the history
Change mMethod type to enum aiMorphingMethod
  • Loading branch information
kimkulling authored Jan 13, 2023
2 parents 33c32b6 + b2672c0 commit eb328ce
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions include/assimp/mesh.h
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,9 @@ struct aiAnimMesh {
/** @brief Enumerates the methods of mesh morphing supported by Assimp.
*/
enum aiMorphingMethod {
/** Morphing method to be determined */
aiMorphingMethod_UNKNOWN = 0x0,

/** Interpolation between morph targets */
aiMorphingMethod_VERTEX_BLEND = 0x1,

Expand Down Expand Up @@ -747,7 +750,7 @@ struct aiMesh {
* Method of morphing when anim-meshes are specified.
* @see aiMorphingMethod to learn more about the provided morphing targets.
*/
unsigned int mMethod;
enum aiMorphingMethod mMethod;

/**
* The bounding box.
Expand Down Expand Up @@ -778,7 +781,7 @@ struct aiMesh {
mMaterialIndex(0),
mNumAnimMeshes(0),
mAnimMeshes(nullptr),
mMethod(0),
mMethod(aiMorphingMethod_UNKNOWN),
mAABB(),
mTextureCoordsNames(nullptr) {
for (unsigned int a = 0; a < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++a) {
Expand Down Expand Up @@ -1002,7 +1005,7 @@ struct aiSkeletonBone {
#endif // __cplusplus
};
/**
* @brief
* @brief
*/
struct aiSkeleton {
/**
Expand Down

0 comments on commit eb328ce

Please sign in to comment.