Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 16:14:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tweaked posterior threshold and head velocity threshold

Browse source
This commit is contained in:
amantley 2018-07-09 13:49:21 -07:00
parent a3417cace9
commit 7ed8f17b57
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3206,19 +3206,13 @@ float MyAvatar::computeStandingHeightMode(const controller::Pose& head) {
// init mode in meters to the current mode // init mode in meters to the current mode
float modeInMeters = getCurrentStandingHeight(); float modeInMeters = getCurrentStandingHeight();
if (head.isValid()) { if (head.isValid()) {
float newReading = head.getTranslation().y;
int newReadingInCentimeters = glm::floor(newReading * CENTIMETERS_PER_METER);
_recentModeReadings.insert(newReadingInCentimeters);
RingBufferHistory<int>::Iterator recentModeReadingsIterator = _recentModeReadings.begin();
RingBufferHistory<int>::Iterator end = _recentModeReadings.end();
std::map<int, int> freq; std::map<int, int> freq;
while(recentModeReadingsIterator != end){ for(auto recentModeReadingsIterator = _recentModeReadings.begin(); recentModeReadingsIterator != _recentModeReadings.end(); ++recentModeReadingsIterator){
freq[*recentModeReadingsIterator] += 1; freq[*recentModeReadingsIterator] += 1;
if (freq[*recentModeReadingsIterator] > greatestFrequency) { if (freq[*recentModeReadingsIterator] > greatestFrequency) {
greatestFrequency = freq[*recentModeReadingsIterator]; greatestFrequency = freq[*recentModeReadingsIterator];
mode = *recentModeReadingsIterator; mode = *recentModeReadingsIterator;
} }
recentModeReadingsIterator++;
} }
modeInMeters = ((float)mode) / CENTIMETERS_PER_METER; 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 not greater check for a reset
if (getResetMode() && qApp->isHMDMode()) { if (getResetMode() && qApp->isHMDMode()) {
setResetMode(false); 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); modeInMeters = (resetModeInCentimeters / CENTIMETERS_PER_METER);
_recentModeReadings.clear(); _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; return modeInMeters;
} }
@ -3557,7 +3550,7 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat
activate(Horizontal); activate(Horizontal);
} }
} }
if (!isActive(Vertical) && (shouldActivateVertical(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) { if (!isActive(Vertical) && (shouldActivateVertical(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) {
activate(Vertical); activate(Vertical);
} }