Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-14 01:46:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed clear map

Browse source
This commit is contained in:
amantley 2019-01-29 17:31:20 -08:00
parent e2a729b68b
commit fb0ad7768c
2 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/avatar/MySkeletonModel.cpp
View file

@ -293,10 +293,6 @@ void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
generateBasisVectors(up, fwd, u, v, w);
AnimPose newSpinePose(glm::mat4(glm::vec4(w, 0.0f), glm::vec4(u, 0.0f), glm::vec4(v, 0.0f), glm::vec4(glm::vec3(0.0f, 0.0f, 0.0f), 1.0f)));
currentSpine2Pose.trans() = rigSpine2.trans();
qCDebug(animation) << "my skeleton model spline spine2 " << rigSpine2.trans();
qCDebug(animation) << "my skeleton model current spine2 " << currentSpine2Pose.trans();
// qCDebug(animation) << "my skeleton model spline hips " << sensorToRigPose * sensorHips;
// qCDebug(animation) << "my skeleton model current hips " << currentHipsPose.trans();
currentSpine2Pose.rot() = safeLerp(currentSpine2Pose.rot(), newSpinePose.rot(), SPINE2_ROTATION_FILTER);
params.primaryControllerPoses[Rig::PrimaryControllerType_Spine2] = currentSpine2Pose;
params.primaryControllerFlags[Rig::PrimaryControllerType_Spine2] = (uint8_t)Rig::ControllerFlags::Enabled | (uint8_t)Rig::ControllerFlags::Estimated;

2
libraries/animation/src/AnimSplineIK.cpp
View file

@ -199,8 +199,6 @@ const AnimPoseVec& AnimSplineIK::evaluate(const AnimVariantMap& animVars, const
AnimPose midTargetPose(midTarget.getRotation(), midTarget.getTranslation());
//_poses[childOfMiddleJointIndex] = midTargetPose.inverse() * childOfMiddleJointAbsolutePoseAfterBaseTipSpline;
}
_splineJointInfoMap.clear();
AnimChain upperJointChain;
AnimPoseVec finalAbsolutePoses;