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

adding ifdef for android os

Browse source
This commit is contained in:
amantley 2019-02-15 10:35:25 -08:00
parent 425413419a
commit d6dfaacf6f
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2951,6 +2951,9 @@ void MyAvatar::initAnimGraph() {
graphUrl = _fstAnimGraphOverrideUrl; graphUrl = _fstAnimGraphOverrideUrl;
} else { } else {
graphUrl = PathUtils::resourcesUrl("avatar/avatar-animation.json"); graphUrl = PathUtils::resourcesUrl("avatar/avatar-animation.json");
#ifdef Q_OS_ANDROID
graphUrl = PathUtils::resourcesUrl("avatar/avatar-animation_withSplineIKNode.json");
#endif
} }
emit animGraphUrlChanged(graphUrl); emit animGraphUrlChanged(graphUrl);

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

@ -131,7 +131,7 @@ const AnimPoseVec& AnimSplineIK::evaluate(const AnimVariantMap& animVars, const
baseParentAbsPose = _skeleton->getAbsolutePose(baseParentIndex, _poses); baseParentAbsPose = _skeleton->getAbsolutePose(baseParentIndex, _poses);
} }
_poses[_baseJointIndex] = baseParentAbsPose.inverse() * baseTargetAbsolutePose; _poses[_baseJointIndex] = baseParentAbsPose.inverse() * baseTargetAbsolutePose;
_poses[_baseJointIndex].scale() = glm::vec3(1.0f); _poses[_baseJointIndex].scale() = 1.0f;
// initialize the middle joint target // initialize the middle joint target
IKTarget midTarget; IKTarget midTarget;
@ -290,7 +290,7 @@ void AnimSplineIK::setSkeletonInternal(AnimSkeleton::ConstPointer skeleton) {
void AnimSplineIK::solveTargetWithSpline(const AnimContext& context, int base, const IKTarget& target, const AnimPoseVec& absolutePoses, bool debug, AnimChain& chainInfoOut) const { void AnimSplineIK::solveTargetWithSpline(const AnimContext& context, int base, const IKTarget& target, const AnimPoseVec& absolutePoses, bool debug, AnimChain& chainInfoOut) const {
// build spline from tip to base // build spline from tip to base
AnimPose tipPose = AnimPose(glm::vec3(1.0f), target.getRotation(), target.getTranslation()); AnimPose tipPose = AnimPose(1.0f, target.getRotation(), target.getTranslation());
AnimPose basePose = absolutePoses[base]; AnimPose basePose = absolutePoses[base];
CubicHermiteSplineFunctorWithArcLength spline; CubicHermiteSplineFunctorWithArcLength spline;
@ -338,7 +338,7 @@ void AnimSplineIK::solveTargetWithSpline(const AnimContext& context, int base, c
glm::mat3 m(u, v, glm::cross(u, v)); glm::mat3 m(u, v, glm::cross(u, v));
glm::quat rot = glm::normalize(glm::quat_cast(m)); glm::quat rot = glm::normalize(glm::quat_cast(m));
AnimPose desiredAbsPose = AnimPose(glm::vec3(1.0f), rot, trans) * splineJointInfo.offsetPose; AnimPose desiredAbsPose = AnimPose(1.0f, rot, trans) * splineJointInfo.offsetPose;
// apply flex coefficent // apply flex coefficent
AnimPose flexedAbsPose; AnimPose flexedAbsPose;
@ -457,7 +457,7 @@ void AnimSplineIK::computeAndCacheSplineJointInfosForIKTarget(const AnimContext&
glm::mat3 m(u, v, glm::cross(u, v)); glm::mat3 m(u, v, glm::cross(u, v));
glm::quat rot = glm::normalize(glm::quat_cast(m)); glm::quat rot = glm::normalize(glm::quat_cast(m));
AnimPose pose(glm::vec3(1.0f), rot, spline(t)); AnimPose pose(1.0f, rot, spline(t));
AnimPose offsetPose = pose.inverse() * defaultPose; AnimPose offsetPose = pose.inverse() * defaultPose;
SplineJointInfo splineJointInfo = { index, ratio, offsetPose }; SplineJointInfo splineJointInfo = { index, ratio, offsetPose };

11
libraries/animation/src/Rig.cpp
View file

@ -1516,8 +1516,13 @@ void Rig::updateHands(bool leftHandEnabled, bool rightHandEnabled, bool hipsEnab
if (ENABLE_POLE_VECTORS && handJointIndex >= 0 && armJointIndex >= 0 && elbowJointIndex >= 0 && oppositeArmJointIndex >= 0) { if (ENABLE_POLE_VECTORS && handJointIndex >= 0 && armJointIndex >= 0 && elbowJointIndex >= 0 && oppositeArmJointIndex >= 0) {
glm::vec3 poleVector; glm::vec3 poleVector;
//bool usePoleVector = calculateElbowPoleVector(handJointIndex, elbowJointIndex, armJointIndex, oppositeArmJointIndex, poleVector); bool usePoleVector = false;
bool usePoleVector = calculateElbowPoleVectorOptimized(handJointIndex, elbowJointIndex, armJointIndex, false, poleVector); #ifdef Q_OS_ANDROID
usePoleVector = calculateElbowPoleVectorOptimized(handJointIndex, elbowJointIndex, armJointIndex, false, poleVector);
#else
usePoleVector = calculateElbowPoleVectorOptimized(handJointIndex, elbowJointIndex, armJointIndex, false, poleVector);
// bool usePoleVector = calculateElbowPoleVector(handJointIndex, elbowJointIndex, armJointIndex, oppositeArmJointIndex, poleVector);
#endif
if (usePoleVector) { if (usePoleVector) {
glm::vec3 sensorPoleVector = transformVectorFast(rigToSensorMatrix, poleVector); glm::vec3 sensorPoleVector = transformVectorFast(rigToSensorMatrix, poleVector);
_animVars.set("rightHandPoleVectorEnabled", true); _animVars.set("rightHandPoleVectorEnabled", true);
@ -1708,7 +1713,7 @@ bool Rig::calculateElbowPoleVectorOptimized(int handIndex, int elbowIndex, int s
// calculate the reference axis and the side axis. // calculate the reference axis and the side axis.
// Look up refVector from animVars, make sure to convert into geom space. // Look up refVector from animVars, make sure to convert into geom space.
glm::vec3 refVector = (AnimPose(_rigToGeometryTransform) * elbowPose).xformVectorFast(Vectors::UNIT_X); glm::vec3 refVector = (AnimPose(_rigToGeometryTransform) * elbowPose).xformVector(Vectors::UNIT_X);
float refVectorLength = glm::length(refVector); float refVectorLength = glm::length(refVector);
if (left) { if (left) {