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

added all the parts for the step conditional to do: failsafe

Browse source
This commit is contained in:
amantley 2018-06-28 11:56:46 -07:00
parent 2307c8e24a
commit 3e6d54e83c
2 changed files with 54 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3152,6 +3152,51 @@ float MyAvatar::computeStandingHeightMode(float newReading) {
return _currentMode;
}
static bool handDirectionMatchesHeadDirection(controller::Pose leftHand, controller::Pose rightHand, controller::Pose head) {
const float HANDS_VELOCITY_DIRECTION_THRESHOLD = 0.4f;
const float VELOCITY_EPSILON = 0.02f;
leftHand.velocity.y = 0.0f;
rightHand.velocity.y = 0.0f;
head.velocity.y = 0.0f;
float handDotHeadLeft = glm::dot(glm::normalize(leftHand.getVelocity()), glm::normalize(head.getVelocity()));
float handDotHeadRight = glm::dot(glm::normalize(rightHand.getVelocity()), glm::normalize(head.getVelocity()));
return ((!leftHand.isValid() || ((handDotHeadLeft > HANDS_VELOCITY_DIRECTION_THRESHOLD) && (glm::length(leftHand.getVelocity()) > VELOCITY_EPSILON))) &&
(!rightHand.isValid() || ((handDotHeadRight > HANDS_VELOCITY_DIRECTION_THRESHOLD) && (glm::length(rightHand.getVelocity()) > VELOCITY_EPSILON))));
}
static bool handAngularVelocityBelowThreshold(controller::Pose leftHand, controller::Pose rightHand) {
const float HANDS_ANGULAR_VELOCITY_THRESHOLD = 0.4f;
leftHand.angularVelocity.y = 0.0f;
rightHand.angularVelocity.y = 0.0f;
float leftHandXZAngularVelocity = glm::length(leftHand.getAngularVelocity());
float rightHandXZAngularVelocity = glm::length(rightHand.getAngularVelocity());
return ((!leftHand.isValid() || (leftHandXZAngularVelocity < HANDS_ANGULAR_VELOCITY_THRESHOLD)) &&
(!rightHand.isValid() || (rightHandXZAngularVelocity < HANDS_ANGULAR_VELOCITY_THRESHOLD)));
}
static bool headVelocityGreaterThanThreshold(glm::vec3 headVelocity) {
const float VELOCITY_EPSILON = 0.02f;
const float HEAD_VELOCITY_THRESHOLD = 0.14f;
float headVelocityMagnitude = glm::length(headVelocity);
return headVelocityMagnitude > HEAD_VELOCITY_THRESHOLD;
}
bool MyAvatar::isHeadLevel(controller::Pose head) {
const float AVERAGING_RATE = 0.03f;
const float HEAD_PITCH_TOLERANCE = 7.0f;
const float HEAD_ROLL_TOLERANCE = 7.0f;
_averageHeadRotation = slerp(_averageHeadRotation, head.getRotation(), AVERAGING_RATE);
glm::vec3 averageHeadEulers = glm::degrees(safeEulerAngles(_averageHeadRotation));
glm::vec3 currentHeadEulers = glm::degrees(safeEulerAngles(head.getRotation()));
glm::vec3 diffFromAverageEulers = averageHeadEulers - currentHeadEulers;
return ((fabs(diffFromAverageEulers.x) < HEAD_PITCH_TOLERANCE) && (fabs(diffFromAverageEulers.z) < HEAD_ROLL_TOLERANCE));
}
float MyAvatar::getUserHeight() const {
return _userHeight.get();
}
@ -3387,7 +3432,13 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar,
if (!isActive(Horizontal) && (getForceActivateHorizontal() ||
(!withinBaseOfSupport(myAvatar.getControllerPoseInAvatarFrame(controller::Action::HEAD).getTranslation()) &&
headAngularVelocityBelowThreshold(myAvatar.getControllerPoseInAvatarFrame(controller::Action::HEAD).getAngularVelocity()) &&
isWithinThresholdHeightMode(myAvatar.computeStandingHeightMode(myAvatar.getControllerPoseInAvatarFrame(controller::Action::HEAD).getTranslation().y), myAvatar.getControllerPoseInAvatarFrame(controller::Action::HEAD).getTranslation().y)))) {
isWithinThresholdHeightMode(myAvatar.computeStandingHeightMode(myAvatar.getControllerPoseInAvatarFrame(controller::Action::HEAD).getTranslation().y), myAvatar.getControllerPoseInAvatarFrame(controller::Action::HEAD).getTranslation().y) &&
handDirectionMatchesHeadDirection(myAvatar.getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND), myAvatar.getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND), myAvatar.getControllerPoseInAvatarFrame(controller::Action::HEAD)) &&
handAngularVelocityBelowThreshold(myAvatar.getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND), myAvatar.getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND)) &&
headVelocityGreaterThanThreshold(myAvatar.getControllerPoseInAvatarFrame(controller::Action::HEAD).getVelocity()) &&
myAvatar.isHeadLevel(myAvatar.getControllerPoseInAvatarFrame(controller::Action::HEAD))))) {
qCDebug(interfaceapp) << "----------------------------------------over the base of support";
activate(Horizontal);
setForceActivateHorizontal(false);

2
interface/src/avatar/MyAvatar.h
View file

@ -1026,6 +1026,7 @@ public:
bool isReadyForPhysics() const;
float computeStandingHeightMode(float newReading);
bool isHeadLevel(controller::Pose head);
//bool isWithinThresholdHeightMode(float newReading);
public slots:
@ -1638,6 +1639,7 @@ private:
int _heightModeArray[SIZE_OF_MODE_ARRAY];
int _currentMode = 0;
bool _resetMode = false;
glm::quat _averageHeadRotation = glm::quat(0.0f,0.0f,0.0f,0.0f);
};