From 7ed8f17b5722afd07fde9d7f2e181230b6669344 Mon Sep 17 00:00:00 2001 From: amantley Date: Mon, 9 Jul 2018 13:49:21 -0700 Subject: [PATCH] tweaked posterior threshold and head velocity threshold --- interface/src/avatar/MyAvatar.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 383b0562fb..45d772d799 100755 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -3206,19 +3206,13 @@ float MyAvatar::computeStandingHeightMode(const controller::Pose& head) { // init mode in meters to the current mode float modeInMeters = getCurrentStandingHeight(); if (head.isValid()) { - float newReading = head.getTranslation().y; - int newReadingInCentimeters = glm::floor(newReading * CENTIMETERS_PER_METER); - _recentModeReadings.insert(newReadingInCentimeters); - RingBufferHistory::Iterator recentModeReadingsIterator = _recentModeReadings.begin(); - RingBufferHistory::Iterator end = _recentModeReadings.end(); std::map freq; - while(recentModeReadingsIterator != end){ + for(auto recentModeReadingsIterator = _recentModeReadings.begin(); recentModeReadingsIterator != _recentModeReadings.end(); ++recentModeReadingsIterator){ freq[*recentModeReadingsIterator] += 1; if (freq[*recentModeReadingsIterator] > greatestFrequency) { greatestFrequency = freq[*recentModeReadingsIterator]; mode = *recentModeReadingsIterator; } - recentModeReadingsIterator++; } modeInMeters = ((float)mode) / CENTIMETERS_PER_METER; @@ -3226,7 +3220,7 @@ float MyAvatar::computeStandingHeightMode(const controller::Pose& head) { // if not greater check for a reset if (getResetMode() && qApp->isHMDMode()) { setResetMode(false); - float resetModeInCentimeters = glm::floor((newReading - MODE_CORRECTION_FACTOR)*CENTIMETERS_PER_METER); + float resetModeInCentimeters = glm::floor((head.getTranslation().y - MODE_CORRECTION_FACTOR)*CENTIMETERS_PER_METER); modeInMeters = (resetModeInCentimeters / CENTIMETERS_PER_METER); _recentModeReadings.clear(); @@ -3237,7 +3231,6 @@ float MyAvatar::computeStandingHeightMode(const controller::Pose& head) { } } } - qCDebug(interfaceapp) << "the mode is " << modeInMeters << "the frequency is " << greatestFrequency; return modeInMeters; } @@ -3557,7 +3550,7 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat activate(Horizontal); } } - + if (!isActive(Vertical) && (shouldActivateVertical(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) { activate(Vertical); }