History

added getter for the orginal cluster bind matrix values in AnimSkeleton

amantley committed 8 years ago

Commit c8cd65c1 parent 80ebde16 files · +32 −30Browse files

Showing the changes to libraries/render-utils/src/Model.cpp (1 of 6 files). Show all

Unified · Split

libraries/render-utils/src/Model.cpp+5−4
@@ -1418,20 +1418,21 @@ void Model::updateClusterMatrices() { · 1417 unmodified lines
14181418 const HFMModel& hfmModel = getHFMModel();
14191419 for (int i = 0; i < (int) _meshStates.size(); i++) {
14201420 MeshState& state = _meshStates[i];
1421+ int meshIndex = i;
14211422 const HFMMesh& mesh = hfmModel.meshes.at(i);
14221423 for (int j = 0; j < mesh.clusters.size(); j++) {
14231424 const HFMCluster& cluster = mesh.clusters.at(j);
1425+ int clusterIndex = j;
1426+
14241427 if (_useDualQuaternionSkinning) {
14251428 auto jointPose = _rig.getJointPose(cluster.jointIndex);
14261429 Transform jointTransform(jointPose.rot(), jointPose.scale(), jointPose.trans());
14271430 Transform clusterTransform;
1428− Transform::mult(clusterTransform, jointTransform, _rig.getAnimSkeleton()->_clusterBindMatrixOriginalValues[i][j].inverseBindTransform);
1429− //Transform::mult(clusterTransform, jointTransform, cluster.inverseBindTransform);
1431+ Transform::mult(clusterTransform, jointTransform, _rig.getAnimSkeleton()->getClusterBindMatricesOriginalValues(meshIndex, clusterIndex).inverseBindTransform);
14301432 state.clusterDualQuaternions[j] = Model::TransformDualQuaternion(clusterTransform);
14311433 } else {
14321434 auto jointMatrix = _rig.getJointTransform(cluster.jointIndex);
1433− glm_mat4u_mul(jointMatrix, _rig.getAnimSkeleton()->_clusterBindMatrixOriginalValues[i][j].inverseBindMatrix, state.clusterMatrices[j]);
1434− // glm_mat4u_mul(jointMatrix, cluster.inverseBindMatrix, state.clusterMatrices[j]);
1435+ glm_mat4u_mul(jointMatrix, _rig.getAnimSkeleton()->getClusterBindMatricesOriginalValues(meshIndex, clusterIndex).inverseBindMatrix, state.clusterMatrices[j]);
14351436 }
14361437 }
14371438 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t