Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

More work on IK.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-04-23 11:34:34 -07:00
parent f7bc1ae62c
commit 511fc8367f
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/avatar/SkeletonModel.cpp
View file

@ -177,8 +177,7 @@ void SkeletonModel::applyPalmData(int jointIndex, const QVector<int>& fingerJoin
} }
// set hand position, rotation // set hand position, rotation
glm::vec3 forearmVector = palmRotation * glm::vec3(sign, 0.0f, 0.0f); setJointPosition(jointIndex, palm.getPosition(), palmRotation, true);
setJointPosition(jointIndex, palm.getPosition(), palmRotation);
} }
void SkeletonModel::updateJointState(int index) { void SkeletonModel::updateJointState(int index) {

26
interface/src/renderer/Model.cpp
View file

@ -896,6 +896,7 @@ bool Model::setJointPosition(int jointIndex, const glm::vec3& translation, const
if (lastFreeIndex == -1) { if (lastFreeIndex == -1) {
lastFreeIndex = freeLineage.last(); lastFreeIndex = freeLineage.last();
} }
float baseWeight = 1.0f / (freeLineage.indexOf(lastFreeIndex) + (useRotation ? 1 : 0));
// this is a cyclic coordinate descent algorithm: see // this is a cyclic coordinate descent algorithm: see
// http://www.ryanjuckett.com/programming/animation/21-cyclic-coordinate-descent-in-2d // http://www.ryanjuckett.com/programming/animation/21-cyclic-coordinate-descent-in-2d
@ -906,7 +907,7 @@ bool Model::setJointPosition(int jointIndex, const glm::vec3& translation, const
glm::quat endRotation; glm::quat endRotation;
if (useRotation) { if (useRotation) {
getJointRotation(jointIndex, endRotation, true); getJointRotation(jointIndex, endRotation, true);
applyRotationDelta(jointIndex, rotation * glm::inverse(endRotation)); applyRotationDelta(jointIndex, safeMix(glm::quat(), rotation * glm::inverse(endRotation), baseWeight));
getJointRotation(jointIndex, endRotation, true); getJointRotation(jointIndex, endRotation, true);
} }
@ -922,17 +923,13 @@ bool Model::setJointPosition(int jointIndex, const glm::vec3& translation, const
glm::vec3 jointPosition = extractTranslation(state.transform); glm::vec3 jointPosition = extractTranslation(state.transform);
glm::vec3 jointVector = endPosition - jointPosition; glm::vec3 jointVector = endPosition - jointPosition;
glm::quat oldCombinedRotation = state.combinedRotation; glm::quat oldCombinedRotation = state.combinedRotation;
glm::quat combinedDelta;
float combinedWeight = 0.0f;
if (useRotation) { if (useRotation) {
applyRotationDelta(index, safeMix(rotationBetween(jointVector, relativePosition - jointPosition), combinedDelta = safeMix(combinedDelta, rotation * glm::inverse(endRotation), baseWeight / (combinedWeight += 1.0f));
rotation * glm::inverse(endRotation), 0.5f));
glm::quat actualDelta = state.combinedRotation * glm::inverse(oldCombinedRotation);
endRotation = actualDelta * endRotation;
endPosition = actualDelta * jointVector + jointPosition;
} else {
applyRotationDelta(index, rotationBetween(jointVector, relativePosition - jointPosition));
endPosition = state.combinedRotation * glm::inverse(oldCombinedRotation) * jointVector + jointPosition;
} }
combinedDelta = safeMix(combinedDelta, rotationBetween(jointVector, relativePosition - jointPosition),
baseWeight / (combinedWeight += 1.0f));
if (alignment != glm::vec3() && j > 1) { if (alignment != glm::vec3() && j > 1) {
jointVector = endPosition - jointPosition; jointVector = endPosition - jointPosition;
glm::vec3 positionSum; glm::vec3 positionSum;
@ -946,9 +943,16 @@ bool Model::setJointPosition(int jointIndex, const glm::vec3& translation, const
glm::vec3 projectedAlignment = glm::cross(jointVector, glm::cross(worldAlignment, jointVector)); glm::vec3 projectedAlignment = glm::cross(jointVector, glm::cross(worldAlignment, jointVector));
const float LENGTH_EPSILON = 0.001f; const float LENGTH_EPSILON = 0.001f;
if (glm::length(projectedCenterOfMass) > LENGTH_EPSILON && glm::length(projectedAlignment) > LENGTH_EPSILON) { if (glm::length(projectedCenterOfMass) > LENGTH_EPSILON && glm::length(projectedAlignment) > LENGTH_EPSILON) {
applyRotationDelta(index, rotationBetween(projectedCenterOfMass, projectedAlignment)); combinedDelta = safeMix(combinedDelta, rotationBetween(projectedCenterOfMass, projectedAlignment),
baseWeight / (combinedWeight += 1.0f));
} }
} }
applyRotationDelta(index, combinedDelta);
glm::quat actualDelta = state.combinedRotation * glm::inverse(oldCombinedRotation);
endPosition = actualDelta * jointVector + jointPosition;
if (useRotation) {
endRotation = actualDelta * endRotation;
}
} }
} }