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

removed print statement and added const upper leg fraction

Browse source
This commit is contained in:
amantley 2018-07-25 10:51:19 -07:00
parent c5599623f7
commit 37540c79b3
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3103,11 +3103,12 @@ glm::vec3 MyAvatar::computeCounterBalance() {
glm::vec3 counterBalancedCg = (1.0f / DEFAULT_AVATAR_HIPS_MASS) * counterBalancedForHead;
// find the height of the hips
const float UPPER_LEG_FRACTION = 0.3333f;
glm::vec3 xzDiff((cgHeadMass.position.x - counterBalancedCg.x), 0.0f, (cgHeadMass.position.z - counterBalancedCg.z));
float headMinusHipXz = glm::length(xzDiff);
float headHipDefault = glm::length(tposeHead - tposeHips);
float hipFootDefault = glm::length(tposeHips - tposeRightFoot);
float sitSquatThreshold = tposeHips.y - (0.333f)*hipFootDefault;
float sitSquatThreshold = tposeHips.y - (UPPER_LEG_FRACTION*hipFootDefault);
float hipHeight = 0.0f;
if (headHipDefault > headMinusHipXz) {
hipHeight = sqrtf((headHipDefault * headHipDefault) - (headMinusHipXz * headMinusHipXz));
@ -3120,11 +3121,9 @@ glm::vec3 MyAvatar::computeCounterBalance() {
// if the height is higher than default hips, clamp to default hips
counterBalancedCg.y = tposeHips.y + 0.05f;
} else if (counterBalancedCg.y < sitSquatThreshold) {
//do a height reset
//do a height reset
setResetMode(true);
_follow.activate(FollowHelper::Vertical);
qCDebug(interfaceapp) << "doing a reset for sitting";
}
return counterBalancedCg;
}