Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 09:28:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Read the palm direction from the FST, use that to determine Leap rotations.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-11-08 15:38:20 -08:00
parent 3446337cc5
commit 0eaaa89c9a
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -141,7 +141,7 @@ void SkeletonModel::applyPalmData(int jointIndex, const QVector<int>& fingerJoin
float sign = (jointIndex == geometry.rightHandJointIndex) ? 1.0f : -1.0f; float sign = (jointIndex == geometry.rightHandJointIndex) ? 1.0f : -1.0f;
glm::quat palmRotation; glm::quat palmRotation;
getJointRotation(jointIndex, palmRotation, true); getJointRotation(jointIndex, palmRotation, true);
palmRotation = rotationBetween(palmRotation * IDENTITY_UP, -palm.getNormal()) * palmRotation; palmRotation = rotationBetween(palmRotation * geometry.palmDirection, palm.getNormal()) * palmRotation;
// sort the finger indices by raw x, get the average direction // sort the finger indices by raw x, get the average direction
QVector<IndexValue> fingerIndices; QVector<IndexValue> fingerIndices;

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

@ -1327,6 +1327,8 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping)
geometry.meshes.append(extracted.mesh); geometry.meshes.append(extracted.mesh);
} }
geometry.palmDirection = parseVec3(mapping.value("palmDirection", "0, -1, 0").toString());
// process attachments // process attachments
QVariantHash attachments = mapping.value("attach").toHash(); QVariantHash attachments = mapping.value("attach").toHash();
for (QVariantHash::const_iterator it = attachments.constBegin(); it != attachments.constEnd(); it++) { for (QVariantHash::const_iterator it = attachments.constBegin(); it != attachments.constEnd(); it++) {

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

@ -145,6 +145,8 @@ public:
QVector<int> leftFingertipJointIndices; QVector<int> leftFingertipJointIndices;
QVector<int> rightFingertipJointIndices; QVector<int> rightFingertipJointIndices;
glm::vec3 palmDirection;
glm::vec3 neckPivot; glm::vec3 neckPivot;
QVector<FBXAttachment> attachments; QVector<FBXAttachment> attachments;