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

added the head angular velocity check

Browse source
This commit is contained in:
amantley 2018-06-27 10:37:54 -07:00
parent 8cf59783d1
commit 3893b7e339
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3129,6 +3129,14 @@ static bool withinBaseOfSupport(glm::vec3 position) {
return (withinFrontBase && withinBackBase && withinLateralBase); return (withinFrontBase && withinBackBase && withinLateralBase);
} }
static bool headAngularVelocityBelowThreshold(glm::vec3 angularVelocity) {
const float ANGULAR_VELOCITY_THRESHOLD = 0.3f;
float xzPlaneAngularVelocity = glm::vec3(angularVelocity.x, 0.0f, angularVelocity.z).length();
bool isBelowThreshold = xzPlaneAngularVelocity < ANGULAR_VELOCITY_THRESHOLD;
qCDebug(interfaceapp) << "head velocity below threshold is: " << isBelowThreshold;
return isBelowThreshold;
}
float MyAvatar::getUserHeight() const { float MyAvatar::getUserHeight() const {
return _userHeight.get(); return _userHeight.get();
} }
@ -3356,15 +3364,12 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat
activate(Rotation); activate(Rotation);
setForceActivateRotation(false); setForceActivateRotation(false);
} }
glm::vec3 temp = myAvatar.getControllerPoseInAvatarFrame(controller::Action::HEAD).getTranslation();
qCDebug(interfaceapp) << temp; headAngularVelocityBelowThreshold(myAvatar.getControllerPoseInAvatarFrame(controller::Action::HEAD).getAngularVelocity());
qCDebug(interfaceapp) << "zero within base " << withinBaseOfSupport(glm::vec3(0.0f,0.0f,0.0f));
qCDebug(interfaceapp) << "10 meters within base " << withinBaseOfSupport(glm::vec3(1.0f, 0.0f, 0.0f));
qCDebug(interfaceapp) << "head within base " << withinBaseOfSupport(temp);
qCDebug(interfaceapp) << "force activate horizontal " << getForceActivateHorizontal();
qCDebug(interfaceapp) << "is active horizontal " << isActive(Horizontal);
if (!isActive(Horizontal) && (getForceActivateHorizontal() || if (!isActive(Horizontal) && (getForceActivateHorizontal() ||
!withinBaseOfSupport(temp))) { (!withinBaseOfSupport(myAvatar.getControllerPoseInAvatarFrame(controller::Action::HEAD).getTranslation()) &&
headAngularVelocityBelowThreshold(myAvatar.getControllerPoseInAvatarFrame(controller::Action::HEAD).getAngularVelocity())))) {
qCDebug(interfaceapp) << "----------------------------------------over the base of support"; qCDebug(interfaceapp) << "----------------------------------------over the base of support";
activate(Horizontal); activate(Horizontal);
setForceActivateHorizontal(false); setForceActivateHorizontal(false);