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

Merge remote-tracking branch 'origin/squattyPottyFix' into squattyPottyFix

Browse source
This commit is contained in:
amantley 2018-10-22 17:50:56 -07:00
commit 472ab1c613
2 changed files with 22 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/hifi/avatarapp/Settings.qml
View file

@ -318,10 +318,6 @@ Rectangle {
ListElement { text: "Disable Recentering"; color: "Red" } ListElement { text: "Disable Recentering"; color: "Red" }
} }
width: 200 width: 200
onCurrentIndexChanged: {
console.debug(cbItems.get(currentIndex).text + ", " + cbItems.get(currentIndex).color)
console.debug("line 2")
}
} }
} }

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

@ -533,7 +533,6 @@ void MyAvatar::update(float deltaTime) {
float tau = deltaTime / HMD_FACING_TIMESCALE; float tau = deltaTime / HMD_FACING_TIMESCALE;
setHipToHandController(computeHandAzimuth()); setHipToHandController(computeHandAzimuth());
qCDebug(interfaceapp) << " the sit state is " << _isInSittingState.get() << " the lock is " << _lockSitStandState.get();
// put the average hand azimuth into sensor space. // put the average hand azimuth into sensor space.
// then mix it with head facing direction to determine rotation recenter // then mix it with head facing direction to determine rotation recenter
@ -3646,12 +3645,9 @@ glm::vec3 MyAvatar::computeCounterBalance() {
glm::vec3 counterBalancedCg = (1.0f / DEFAULT_AVATAR_HIPS_MASS) * counterBalancedForHead; glm::vec3 counterBalancedCg = (1.0f / DEFAULT_AVATAR_HIPS_MASS) * counterBalancedForHead;
// find the height of the hips // 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)); glm::vec3 xzDiff((cgHeadMass.position.x - counterBalancedCg.x), 0.0f, (cgHeadMass.position.z - counterBalancedCg.z));
float headMinusHipXz = glm::length(xzDiff); float headMinusHipXz = glm::length(xzDiff);
float headHipDefault = glm::length(tposeHead - tposeHips); float headHipDefault = glm::length(tposeHead - tposeHips);
float hipFootDefault = tposeHips.y - tposeRightFoot.y;
float sitSquatThreshold = tposeHips.y - (UPPER_LEG_FRACTION * hipFootDefault);
float hipHeight = 0.0f; float hipHeight = 0.0f;
if (headHipDefault > headMinusHipXz) { if (headHipDefault > headMinusHipXz) {
hipHeight = sqrtf((headHipDefault * headHipDefault) - (headMinusHipXz * headMinusHipXz)); hipHeight = sqrtf((headHipDefault * headHipDefault) - (headMinusHipXz * headMinusHipXz));
@ -3954,28 +3950,29 @@ void MyAvatar::setUserRecenterModel(MyAvatar::SitStandModelType modelName) {
_userRecenterModel.set(modelName); _userRecenterModel.set(modelName);
switch (modelName) { switch (modelName) {
case SitStandModelType::ForceSit: case MyAvatar::SitStandModelType::ForceSit:
setHMDLeanRecenterEnabled(true); setHMDLeanRecenterEnabled(true);
setIsInSittingState(true); setIsInSittingState(true);
setIsSitStandStateLocked(true); setIsSitStandStateLocked(true);
break; break;
case SitStandModelType::ForceStand: case MyAvatar::SitStandModelType::ForceStand:
setHMDLeanRecenterEnabled(true); setHMDLeanRecenterEnabled(true);
setIsInSittingState(false); setIsInSittingState(false);
setIsSitStandStateLocked(true); setIsSitStandStateLocked(true);
break; break;
case SitStandModelType::Auto: case MyAvatar::SitStandModelType::Auto:
setHMDLeanRecenterEnabled(true); setHMDLeanRecenterEnabled(true);
setIsInSittingState(false); setIsInSittingState(false);
setIsSitStandStateLocked(false); setIsSitStandStateLocked(false);
break; break;
case SitStandModelType::DisableHMDLean: case MyAvatar::SitStandModelType::DisableHMDLean:
setHMDLeanRecenterEnabled(false); setHMDLeanRecenterEnabled(false);
setIsInSittingState(false); setIsInSittingState(false);
setIsSitStandStateLocked(false); setIsSitStandStateLocked(false);
break; break;
default:
break;
} }
qCDebug(interfaceapp) << "recenter property changed " << modelName << " sit " << _isInSittingState.get() << " lock " << _lockSitStandState.get();
emit userRecenterModelChanged((int)modelName); emit userRecenterModelChanged((int)modelName);
} }
@ -4231,7 +4228,6 @@ bool MyAvatar::FollowHelper::shouldActivateVertical(const MyAvatar& myAvatar, co
const float CYLINDER_TOP = 0.1f; const float CYLINDER_TOP = 0.1f;
const float CYLINDER_BOTTOM = -1.5f; const float CYLINDER_BOTTOM = -1.5f;
const float SITTING_BOTTOM = -0.02f; const float SITTING_BOTTOM = -0.02f;
const int SQUATTY_COUNT_THRESHOLD = 1800;
glm::vec3 offset = extractTranslation(desiredBodyMatrix) - extractTranslation(currentBodyMatrix); glm::vec3 offset = extractTranslation(desiredBodyMatrix) - extractTranslation(currentBodyMatrix);
bool returnValue = false; bool returnValue = false;