|
@@ -55,9 +55,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
|
|
#include <assimp/MathFunctions.h>
|
|
#include <assimp/MathFunctions.h>
|
|
#include <assimp/StringComparison.h>
|
|
#include <assimp/StringComparison.h>
|
|
-
|
|
|
|
#include <assimp/scene.h>
|
|
#include <assimp/scene.h>
|
|
-
|
|
|
|
#include <assimp/CreateAnimMesh.h>
|
|
#include <assimp/CreateAnimMesh.h>
|
|
#include <assimp/StringUtils.h>
|
|
#include <assimp/StringUtils.h>
|
|
#include <assimp/commonMetaData.h>
|
|
#include <assimp/commonMetaData.h>
|
|
@@ -1604,7 +1602,7 @@ void FBXConverter::ConvertWeights(aiMesh *out, const MeshGeometry &geo, const ai
|
|
|
|
|
|
void FBXConverter::ConvertCluster(std::vector<aiBone*> &local_mesh_bones, const Cluster *cluster,
|
|
void FBXConverter::ConvertCluster(std::vector<aiBone*> &local_mesh_bones, const Cluster *cluster,
|
|
std::vector<size_t> &out_indices, std::vector<size_t> &index_out_indices,
|
|
std::vector<size_t> &out_indices, std::vector<size_t> &index_out_indices,
|
|
- std::vector<size_t> &count_out_indices, const aiMatrix4x4 & /* absolute_transform*/,
|
|
|
|
|
|
+ std::vector<size_t> &count_out_indices, const aiMatrix4x4 &absolute_transform,
|
|
aiNode *) {
|
|
aiNode *) {
|
|
ai_assert(cluster != nullptr); // make sure cluster valid
|
|
ai_assert(cluster != nullptr); // make sure cluster valid
|
|
|
|
|
|
@@ -1627,7 +1625,7 @@ void FBXConverter::ConvertCluster(std::vector<aiBone*> &local_mesh_bones, const
|
|
bone->mOffsetMatrix = cluster->TransformLink();
|
|
bone->mOffsetMatrix = cluster->TransformLink();
|
|
bone->mOffsetMatrix.Inverse();
|
|
bone->mOffsetMatrix.Inverse();
|
|
|
|
|
|
- aiMatrix4x4 matrix = (aiMatrix4x4)absolute_transform;
|
|
|
|
|
|
+ const aiMatrix4x4 matrix = (aiMatrix4x4)absolute_transform;
|
|
|
|
|
|
bone->mOffsetMatrix = bone->mOffsetMatrix * matrix; // * mesh_offset
|
|
bone->mOffsetMatrix = bone->mOffsetMatrix * matrix; // * mesh_offset
|
|
|
|
|