From 52a21d4dfd1e1eb221f9c9da064cfae126942dd0 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 21 Feb 2014 16:55:20 -0800 Subject: [PATCH] hook to request user's location from data-server --- interface/src/Menu.cpp | 10 ++++++++-- interface/src/avatar/MyAvatar.cpp | 3 +++ interface/src/avatar/MyAvatar.h | 1 + libraries/shared/src/AccountManager.h | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 1ac17ca51a..3d217eddd0 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -1049,8 +1049,14 @@ void Menu::goTo() { // go to coordinate destination or to Username if (!goToDestination(destination)) { - // there's a username entered by the user, make a request to the data-server - + JSONCallbackParameters callbackParams; + callbackParams.jsonCallbackReceiver = Application::getInstance()->getAvatar(); + callbackParams.jsonCallbackMethod = "goToLocationFromResponse"; + + // there's a username entered by the user, make a request to the data-server for the associated location + AccountManager::getInstance().authenticatedRequest("/api/v1/users/" + gotoDialog.textValue() + "/location", + QNetworkAccessManager::GetOperation, + callbackParams); } } diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index c547406779..5c81ca3cb1 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -1200,3 +1200,6 @@ void MyAvatar::updateLocationInDataServer() { } } +void MyAvatar::goToLocationFromResponse(const QJsonObject& jsonObject) { + qDebug() << jsonObject; +} diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index 21434f3041..672843ad94 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -90,6 +90,7 @@ public slots: void resetSize(); void updateLocationInDataServer(); + void goToLocationFromResponse(const QJsonObject& jsonObject); // Set/Get update the thrust that will move the avatar around void addThrust(glm::vec3 newThrust) { _thrust += newThrust; }; diff --git a/libraries/shared/src/AccountManager.h b/libraries/shared/src/AccountManager.h index 8ffd533949..32347b8e5f 100644 --- a/libraries/shared/src/AccountManager.h +++ b/libraries/shared/src/AccountManager.h @@ -38,7 +38,7 @@ public: static AccountManager& getInstance(); void authenticatedRequest(const QString& path, - QNetworkAccessManager::Operation operation, + QNetworkAccessManager::Operation operation = QNetworkAccessManager::GetOperation, const JSONCallbackParameters& callbackParams = JSONCallbackParameters(), const QByteArray& dataByteArray = QByteArray());