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

adding the recentering back into the non hmd lean code

Browse source
This commit is contained in:
amantley 2018-07-03 11:46:59 -07:00
parent f216316b55
commit 9e5763ea5c
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3533,7 +3533,7 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat
activate(Vertical); activate(Vertical);
} }
} else { } else {
if (!isActive(Rotation) && getForceActivateRotation()) { if (!isActive(Rotation) && (getForceActivateRotation() || shouldActivateRotation(myAvatar, desiredBodyMatrix, currentBodyMatrix))) {
activate(Rotation); activate(Rotation);
setForceActivateRotation(false); setForceActivateRotation(false);
} }
@ -3541,7 +3541,7 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat
activate(Horizontal); activate(Horizontal);
setForceActivateHorizontal(false); setForceActivateHorizontal(false);
} }
if (!isActive(Vertical) && getForceActivateVertical()) { if (!isActive(Vertical) && (getForceActivateVertical() || shouldActivateVertical(myAvatar, desiredBodyMatrix, currentBodyMatrix))) {
activate(Vertical); activate(Vertical);
setForceActivateVertical(false); setForceActivateVertical(false);
} }

1
interface/src/avatar/MyAvatar.h
View file

@ -1646,7 +1646,6 @@ private:
bool _shouldLoadScripts { false }; bool _shouldLoadScripts { false };
bool _haveReceivedHeightLimitsFromDomain { false }; bool _haveReceivedHeightLimitsFromDomain { false };
}; };
QScriptValue audioListenModeToScriptValue(QScriptEngine* engine, const AudioListenerMode& audioListenerMode); QScriptValue audioListenModeToScriptValue(QScriptEngine* engine, const AudioListenerMode& audioListenerMode);