Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-13 06:03:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Attempting the fingers again.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-11-07 13:57:54 -08:00
parent 797645a209
commit aec7dbca08
3 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -132,31 +132,34 @@ bool operator<(const IndexValue& firstIndex, const IndexValue& secondIndex) {
}
void SkeletonModel::applyPalmData(int jointIndex, const QVector<int>& fingertipJointIndices, PalmData& palm) {
const FBXGeometry& geometry = _geometry->getFBXGeometry();
setJointPosition(jointIndex, palm.getPosition());
float sign = jointIndex == geometry.rightHandJointIndex ? 1.0f : -1.0f;
setJointRotation(jointIndex, rotationBetween(_rotation * IDENTITY_UP, -palm.getNormal()) * _rotation *
glm::angleAxis(90.0f, 0.0f, jointIndex == _geometry->getFBXGeometry().rightHandJointIndex ? 1.0f : -1.0f, 0.0f), true);
glm::angleAxis(90.0f, 0.0f, sign, 0.0f), true);
// no point in continuing if there are no fingers
if (true || palm.getNumFingers() == 0) {
if (palm.getNumFingers() == 0) {
return;
}
// sort the finger indices by raw x
QVector<IndexValue> fingerIndices;
for (int i = 0; i < palm.getNumFingers(); i++) {
IndexValue indexValue = { i, palm.getFingers()[i].getTipRawPosition().x };
for (int i = 0; i < qMin(5, (int)palm.getNumFingers()); i++) {
IndexValue indexValue = { i, palm.getFingers()[i].getRootRawPosition().x };
fingerIndices.append(indexValue);
}
//qSort(fingerIndices.begin(), fingerIndices.end());
qSort(fingerIndices.begin(), fingerIndices.end());
// likewise with the joint indices and relative x
// likewise with the joint indices and relative z
QVector<IndexValue> jointIndices;
foreach (int index, fingertipJointIndices) {
glm::vec3 position = glm::inverse(_rotation) * extractTranslation(_jointStates[index].transform);
IndexValue indexValue = { index, position.x };
for (int i = 0; i < qMin(5, (int)fingertipJointIndices.size()); i++) {
int index = fingertipJointIndices.at(i);
glm::vec3 position = glm::inverse(_rotation) * extractTranslation(geometry.joints.at(index).bindTransform);
IndexValue indexValue = { index, position.z * -sign };
jointIndices.append(indexValue);
}
//qSort(jointIndices.begin(), jointIndices.end());
qSort(jointIndices.begin(), jointIndices.end());
// match them up as best we can
float proportion = fingerIndices.size() / (float)jointIndices.size();

5
interface/src/renderer/FBXReader.cpp
View file

@ -1205,8 +1205,9 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping)
extracted.mesh.clusters.append(fbxCluster);
// override the bind rotation with the transform link
geometry.joints[fbxCluster.jointIndex].inverseBindRotation =
glm::inverse(extractRotation(cluster.transformLink));
FBXJoint& joint = geometry.joints[fbxCluster.jointIndex];
joint.inverseBindRotation = glm::inverse(extractRotation(cluster.transformLink));
joint.bindTransform = cluster.transformLink;
}
}

1
interface/src/renderer/FBXReader.h
View file

@ -55,6 +55,7 @@ public:
glm::mat4 transform;
glm::quat inverseDefaultRotation;
glm::quat inverseBindRotation;
glm::mat4 bindTransform;
};
/// A single binding to a joint in an FBX document.