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

Skip the hands' parents as well as the hands themselves.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-12-05 11:10:22 -08:00
parent 193f676fcb
commit 9b3560d414
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/avatar/Hand.cpp
View file

@ -165,9 +165,11 @@ void Hand::calculateGeometry() {
}
const float PALM_RADIUS = 0.01f;
glm::vec3 penetration;
int skipIndex = (i == leftPalmIndex) ? _owningAvatar->getSkeletonModel().getLeftHandJointIndex() :
(i == rightPalmIndex) ? _owningAvatar->getSkeletonModel().getRightHandJointIndex() : -1;
if (_owningAvatar->getSkeletonModel().findSpherePenetration(palm.getPosition(),
const Model& skeletonModel = _owningAvatar->getSkeletonModel();
int skipIndex = skeletonModel.getParentJointIndex(
(i == leftPalmIndex) ? skeletonModel.getLeftHandJointIndex() :
(i == rightPalmIndex) ? skeletonModel.getRightHandJointIndex() : -1);
if (skeletonModel.findSpherePenetration(palm.getPosition(),
PALM_RADIUS * _owningAvatar->getScale(), penetration, skipIndex)) {
palm.addToPosition(-penetration);
}

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

@ -454,6 +454,10 @@ bool Model::render(float alpha) {
return true;
}
int Model::getParentJointIndex(int jointIndex) const {
return (isActive() && jointIndex != -1) ? _geometry->getFBXGeometry().joints.at(jointIndex).parentIndex : -1;
}
bool Model::getHeadPosition(glm::vec3& headPosition) const {
return isActive() && getJointPosition(_geometry->getFBXGeometry().headJointIndex, headPosition);
}

3
interface/src/renderer/Model.h
View file

@ -60,6 +60,9 @@ public:
/// Returns the index of the right hand joint, or -1 if not found.
int getRightHandJointIndex() const { return isActive() ? _geometry->getFBXGeometry().rightHandJointIndex : -1; }
/// Returns the index of the parent of the indexed joint, or -1 if not found.
int getParentJointIndex(int jointIndex) const;
/// Returns the position of the head joint.
/// \return whether or not the head was found
bool getHeadPosition(glm::vec3& headPosition) const;