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

Merge pull request #2357 from birarda/orientation-fix

Browse source 
re-do orientation changes after force push to master
This commit is contained in:
Stephen Birarda 2014-03-18 12:27:57 -07:00
commit e6365a1b4d
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -85,6 +85,7 @@ void MyAvatar::reset() {
setVelocity(glm::vec3(0,0,0)); setVelocity(glm::vec3(0,0,0));
setThrust(glm::vec3(0,0,0)); setThrust(glm::vec3(0,0,0));
setOrientation(glm::quat(glm::vec3(0,0,0)));
} }
void MyAvatar::setMoveTarget(const glm::vec3 moveTarget) { void MyAvatar::setMoveTarget(const glm::vec3 moveTarget) {
@ -1189,9 +1190,9 @@ void MyAvatar::goToLocationFromResponse(const QJsonObject& jsonObject) {
NodeList::getInstance()->getDomainInfo().setHostname(domainHostnameString); NodeList::getInstance()->getDomainInfo().setHostname(domainHostnameString);
// orient the user to face the target // orient the user to face the target
glm::quat newOrientation = glm::quat(glm::vec3(orientationItems[0].toFloat(), glm::quat newOrientation = glm::quat(glm::radians(glm::vec3(orientationItems[0].toFloat(),
orientationItems[1].toFloat(), orientationItems[1].toFloat(),
orientationItems[2].toFloat())) orientationItems[2].toFloat())))
* glm::angleAxis(PI, glm::vec3(0.0f, 1.0f, 0.0f)); * glm::angleAxis(PI, glm::vec3(0.0f, 1.0f, 0.0f));
setOrientation(newOrientation); setOrientation(newOrientation);