History

merge from upstream

Seth Alves committed 8 years ago

Commit 64a46bf2 parents 98e0e66 b97c938107 files · +1462 −601Browse files

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

Unified · Split

libraries/render-utils/src/CauterizedModel.cpp+2−0
@@ -115,6 +115,7 @@ void CauterizedModel::updateClusterMatrices() { · 114 unmodified lines
115 Transform clusterTransform;115 Transform clusterTransform;
116 Transform::mult(clusterTransform, jointTransform, cluster.inverseBindTransform);116 Transform::mult(clusterTransform, jointTransform, cluster.inverseBindTransform);
117 state.clusterTransforms[j] = Model::TransformDualQuaternion(clusterTransform);117 state.clusterTransforms[j] = Model::TransformDualQuaternion(clusterTransform);
118 state.clusterTransforms[j].setCauterizationParameters(0.0f, jointPose.trans());
118#else119#else
119 auto jointMatrix = _rig.getJointTransform(cluster.jointIndex);120 auto jointMatrix = _rig.getJointTransform(cluster.jointIndex);
120 glm_mat4u_mul(jointMatrix, cluster.inverseBindMatrix, state.clusterTransforms[j]);121 glm_mat4u_mul(jointMatrix, cluster.inverseBindMatrix, state.clusterTransforms[j]);
@@ -151,6 +152,7 @@ void CauterizedModel::updateClusterMatrices() { · 30 unmodified lines
151 Transform clusterTransform;152 Transform clusterTransform;
152 Transform::mult(clusterTransform, jointTransform, cluster.inverseBindTransform);153 Transform::mult(clusterTransform, jointTransform, cluster.inverseBindTransform);
153 state.clusterTransforms[j] = Model::TransformDualQuaternion(clusterTransform);154 state.clusterTransforms[j] = Model::TransformDualQuaternion(clusterTransform);
155 state.clusterTransforms[j].setCauterizationParameters(1.0f, cauterizePose.trans());
154#else156#else
155 glm_mat4u_mul(cauterizeMatrix, cluster.inverseBindMatrix, state.clusterTransforms[j]);157 glm_mat4u_mul(cauterizeMatrix, cluster.inverseBindMatrix, state.clusterTransforms[j]);
156#endif158#endif

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