Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 12:04:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

initial addition of the AddressManager with location switch hooked up

Browse source
This commit is contained in:
Stephen Birarda 2014-09-11 10:14:00 -07:00
parent ee6a90dd54
commit 71f2c0b542
13 changed files with 249 additions and 205 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interface/src/Application.cpp
View file

@ -51,6 +51,7 @@
#include <QMimeData>
#include <QMessageBox>
#include <AddressManager.h>
#include <AccountManager.h>
#include <AudioInjector.h>
#include <EntityScriptingInterface.h>
@ -421,6 +422,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
MIDIManager& midiManagerInstance = MIDIManager::getInstance();
midiManagerInstance.openDefaultPort();
#endif
AddressManager::getInstance().handleLookupString("1.5,2.5,0.0/0.0,-161.98,0.02");
}
Application::~Application() {
@ -809,7 +812,7 @@ bool Application::event(QEvent* event) {
QFileOpenEvent* fileEvent = static_cast<QFileOpenEvent*>(event);
bool isHifiSchemeURL = !fileEvent->url().isEmpty() && fileEvent->url().toLocalFile().startsWith(CUSTOM_URL_SCHEME);
if (isHifiSchemeURL) {
Menu::getInstance()->goToURL(fileEvent->url().toLocalFile());
// Menu::getInstance()->goToURL(fileEvent->url().toLocalFile());
}
return false;
}
@ -1059,7 +1062,7 @@ void Application::keyPressEvent(QKeyEvent* event) {
break;
case Qt::Key_At:
Menu::getInstance()->goTo();
// Menu::getInstance()->goTo();
break;
default:
event->ignore();
@ -3360,7 +3363,7 @@ void Application::updateWindowTitle(){
#ifndef WIN32
// crashes with vs2013/win32
qDebug("Application title set to: %s", title.toStdString().c_str());
#endif !WIN32
#endif
_window->setWindowTitle(title);
}
@ -4114,11 +4117,11 @@ void Application::urlGoTo(int argc, const char * constArgv[]) {
// goto either @user, #place, or x-xx,y-yy,z-zz
// style co-ordinate.
Menu::goTo(destination);
// Menu::goTo(destination);
if (!orientation.isEmpty()) {
// location orientation
Menu::goToOrientation(orientation);
// Menu::goToOrientation(orientation);
}
}
}

126
interface/src/Menu.cpp
View file

@ -183,8 +183,6 @@ Menu::Menu() :
Qt::Key_At,
this,
SLOT(goTo()));
connect(&LocationManager::getInstance(), &LocationManager::multipleDestinationsFound,
this, &Menu::multipleDestinationsDecision);
addDisabledActionAndSeparator(fileMenu, "Upload Avatar Model");
addActionToQMenuAndActionHash(fileMenu, MenuOption::UploadHead, 0, Application::getInstance(), SLOT(uploadHead()));
@ -1191,107 +1189,25 @@ void Menu::goToDomainDialog() {
sendFakeEnterEvent();
}
void Menu::goToOrientation(QString orientation) {
LocationManager::getInstance().goToOrientation(orientation);
}
void Menu::addressBarDialog() {
bool Menu::goToDestination(QString destination) {
return LocationManager::getInstance().goToDestination(destination);
}
void Menu::goTo(QString destination) {
LocationManager::getInstance().goTo(destination);
}
void Menu::goTo() {
QInputDialog gotoDialog(Application::getInstance()->getWindow());
gotoDialog.setWindowTitle("Go to");
gotoDialog.setLabelText("Destination or URL:\n @user, #place, hifi://domain/location/orientation");
QInputDialog addressBarDialog(Application::getInstance()->getWindow());
addressBarDialog.setWindowTitle("Address Bar");
addressBarDialog.setLabelText("place, @user, hifi://domain/path, position/orientation");
QString destination = QString();
gotoDialog.setTextValue(destination);
gotoDialog.resize(gotoDialog.parentWidget()->size().width() * DIALOG_RATIO_OF_WINDOW, gotoDialog.size().height());
addressBarDialog.setTextValue(destination);
addressBarDialog.resize(addressBarDialog.parentWidget()->size().width() * DIALOG_RATIO_OF_WINDOW,
addressBarDialog.size().height());
int dialogReturn = gotoDialog.exec();
if (dialogReturn == QDialog::Accepted && !gotoDialog.textValue().isEmpty()) {
QString desiredDestination = gotoDialog.textValue();
if (!goToURL(desiredDestination)) {;
goTo(desiredDestination);
}
int dialogReturn = addressBarDialog.exec();
if (dialogReturn == QDialog::Accepted && !addressBarDialog.textValue().isEmpty()) {
// let the location manager parse this out and decide what to do with it
// LocationManager::getInstance().handleAddressBarEntry(addressBarDialog.textValue());
}
sendFakeEnterEvent();
}
bool Menu::goToURL(QString location) {
if (location.startsWith(CUSTOM_URL_SCHEME + "/")) {
QStringList urlParts = location.remove(0, CUSTOM_URL_SCHEME.length()).split('/', QString::SkipEmptyParts);
if (urlParts.count() > 1) {
// if url has 2 or more parts, the first one is domain name
QString domain = urlParts[0];
// second part is either a destination coordinate or
// a place name
QString destination = urlParts[1];
// any third part is an avatar orientation.
QString orientation = urlParts.count() > 2 ? urlParts[2] : QString();
goToDomain(domain);
// goto either @user, #place, or x-xx,y-yy,z-zz
// style co-ordinate.
goTo(destination);
if (!orientation.isEmpty()) {
// location orientation
goToOrientation(orientation);
}
} else if (urlParts.count() == 1) {
QString destination = urlParts[0];
// If this starts with # or @, treat it as a user/location, otherwise treat it as a domain
if (destination[0] == '#' || destination[0] == '@') {
goTo(destination);
} else {
goToDomain(destination);
}
}
return true;
}
return false;
}
void Menu::goToUser(const QString& user) {
LocationManager::getInstance().goTo(user);
}
/// Open a url, shortcutting any "hifi" scheme URLs to the local application.
void Menu::openUrl(const QUrl& url) {
if (url.scheme() == "hifi") {
goToURL(url.toString());
} else {
QDesktopServices::openUrl(url);
}
}
void Menu::multipleDestinationsDecision(const QJsonObject& userData, const QJsonObject& placeData) {
QMessageBox msgBox;
msgBox.setText("Both user and location exists with same name");
msgBox.setInformativeText("Where you wanna go?");
msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Open);
msgBox.button(QMessageBox::Ok)->setText("User");
msgBox.button(QMessageBox::Open)->setText("Place");
int userResponse = msgBox.exec();
if (userResponse == QMessageBox::Ok) {
Application::getInstance()->getAvatar()->goToLocationFromAddress(userData["address"].toObject());
} else if (userResponse == QMessageBox::Open) {
Application::getInstance()->getAvatar()->goToLocationFromAddress(placeData["address"].toObject());
}
}
void Menu::muteEnvironment() {
int headerSize = numBytesForPacketHeaderGivenPacketType(PacketTypeMuteEnvironment);
int packetSize = headerSize + sizeof(glm::vec3) + sizeof(float);
@ -1316,26 +1232,6 @@ void Menu::muteEnvironment() {
free(packet);
}
void Menu::goToLocation() {
MyAvatar* myAvatar = Application::getInstance()->getAvatar();
glm::vec3 avatarPos = myAvatar->getPosition();
QString currentLocation = QString("%1, %2, %3").arg(QString::number(avatarPos.x),
QString::number(avatarPos.y), QString::number(avatarPos.z));
QInputDialog coordinateDialog(Application::getInstance()->getWindow());
coordinateDialog.setWindowTitle("Go to Location");
coordinateDialog.setLabelText("Coordinate as x,y,z:");
coordinateDialog.setTextValue(currentLocation);
coordinateDialog.resize(coordinateDialog.parentWidget()->size().width() * 0.30, coordinateDialog.size().height());
int dialogReturn = coordinateDialog.exec();
if (dialogReturn == QDialog::Accepted && !coordinateDialog.textValue().isEmpty()) {
goToDestination(coordinateDialog.textValue());
}
sendFakeEnterEvent();
}
void Menu::namedLocationCreated(LocationManager::NamedLocationCreateResponse response) {
if (response == LocationManager::Created) {

12
interface/src/Menu.h
View file

@ -162,11 +162,8 @@ public:
int menuItemLocation = UNSPECIFIED_POSITION);
void removeAction(QMenu* menu, const QString& actionName);
bool static goToDestination(QString destination);
void static goToOrientation(QString orientation);
void static goToDomain(const QString newDomain);
void static goTo(QString destination);
const QByteArray& getWalletPrivateKey() const { return _walletPrivateKey; }
@ -185,11 +182,8 @@ public slots:
void saveSettings(QSettings* settings = NULL);
void importSettings();
void exportSettings();
void goTo();
bool goToURL(QString location);
void goToUser(const QString& user);
void addressBarDialog();
void pasteToVoxel();
void openUrl(const QUrl& url);
void toggleLoginMenuItem();
@ -212,7 +206,6 @@ private slots:
void editAnimations();
void changePrivateKey();
void goToDomainDialog();
void goToLocation();
void nameLocation();
void toggleLocationList();
void bandwidthDetailsClosed();
@ -227,7 +220,6 @@ private slots:
void toggleChat();
void audioMuteToggled();
void namedLocationCreated(LocationManager::NamedLocationCreateResponse response);
void multipleDestinationsDecision(const QJsonObject& userData, const QJsonObject& placeData);
void muteEnvironment();
private:

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

@ -21,6 +21,7 @@
#include <QtCore/QTimer>
#include <AccountManager.h>
#include <AddressManager.h>
#include <GeometryUtil.h>
#include <NodeList.h>
#include <PacketHeaders.h>
@ -91,6 +92,9 @@ MyAvatar::MyAvatar() :
Ragdoll* ragdoll = _skeletonModel.buildRagdoll();
_physicsSimulation.setRagdoll(ragdoll);
_physicsSimulation.addEntity(&_voxelShapeManager);
// connect to AddressManager signal for location jumps
connect(&AddressManager::getInstance(), &AddressManager::locationChangeRequired, this, &MyAvatar::goToLocation);
}
MyAvatar::~MyAvatar() {
@ -1798,45 +1802,29 @@ void MyAvatar::resetSize() {
qDebug("Reseted scale to %f", _targetScale);
}
void MyAvatar::goToLocationFromResponse(const QJsonObject& jsonObject) {
QJsonObject locationObject = jsonObject["data"].toObject()["address"].toObject();
bool isOnline = jsonObject["data"].toObject()["online"].toBool();
if (isOnline ) {
goToLocationFromAddress(locationObject);
} else {
QMessageBox::warning(Application::getInstance()->getWindow(), "", "The user is not online.");
}
}
void MyAvatar::goToLocationFromAddress(const QJsonObject& locationObject) {
void MyAvatar::goToLocation(const glm::vec3& newPosition, bool hasOrientation, const glm::vec3& newOrientation) {
// send a node kill request, indicating to other clients that they should play the "disappeared" effect
sendKillAvatar();
QString positionString = locationObject["position"].toString();
QString orientationString = locationObject["orientation"].toString();
QString domainHostnameString = locationObject["domain"].toString();
qDebug() << "Changing domain to" << domainHostnameString <<
", position to" << positionString <<
", and orientation to" << orientationString;
QStringList coordinateItems = positionString.split(',');
QStringList orientationItems = orientationString.split(',');
NodeList::getInstance()->getDomainHandler().setHostname(domainHostnameString);
// orient the user to face the target
glm::quat newOrientation = glm::quat(glm::radians(glm::vec3(orientationItems[0].toFloat(),
orientationItems[1].toFloat(),
orientationItems[2].toFloat())))
* glm::angleAxis(PI, glm::vec3(0.0f, 1.0f, 0.0f));
setOrientation(newOrientation);
glm::quat quatOrientation = getOrientation();
qDebug().nospace() << "MyAvatar goToLocation - moving to " << newPosition.x << ", "
<< newPosition.y << ", " << newPosition.z;
if (hasOrientation) {
qDebug().nospace() << "MyAvatar goToLocation - new orientation is "
<< newOrientation.x << ", " << newOrientation.y << ", " << newOrientation.z;
// orient the user to face the target
glm::quat quatOrientation = glm::quat(glm::radians(newOrientation))
* glm::angleAxis(PI, glm::vec3(0.0f, 1.0f, 0.0f));
setOrientation(quatOrientation);
}
// move the user a couple units away
const float DISTANCE_TO_USER = 2.0f;
glm::vec3 newPosition = glm::vec3(coordinateItems[0].toFloat(), coordinateItems[1].toFloat(),
coordinateItems[2].toFloat()) - newOrientation * IDENTITY_FRONT * DISTANCE_TO_USER;
slamPosition(newPosition);
glm::vec3 shiftedPosition = newPosition - quatOrientation * IDENTITY_FRONT * DISTANCE_TO_USER;
slamPosition(shiftedPosition);
emit transformChanged();
}

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

@ -155,8 +155,7 @@ public slots:
void decreaseSize();
void resetSize();
void goToLocationFromResponse(const QJsonObject& jsonObject);
void goToLocationFromAddress(const QJsonObject& jsonObject);
void goToLocation(const glm::vec3& newPosition, bool hasOrientation, const glm::vec3& newOrientation);
// Set/Get update the thrust that will move the avatar around
void addThrust(glm::vec3 newThrust) { _thrust += newThrust; };

86
interface/src/location/LocationManager.cpp
View file

@ -16,15 +16,9 @@
#include <UserActivityLogger.h>
const QString GET_USER_ADDRESS = "/api/v1/users/%1/address";
const QString GET_PLACE_ADDRESS = "/api/v1/places/%1";
const QString GET_ADDRESSES = "/api/v1/addresses/%1";
const QString GET_PLACE_ADDRESS = "/api/v1/metaverse/search/%1";
const QString POST_PLACE_CREATE = "/api/v1/places/";
LocationManager::LocationManager() {
};
LocationManager& LocationManager::getInstance() {
static LocationManager sharedInstance;
return sharedInstance;
@ -63,7 +57,7 @@ void LocationManager::createNamedLocation(NamedLocation* namedLocation) {
void LocationManager::goTo(QString destination) {
const QString USER_DESTINATION_TYPE = "user";
const QString PLACE_DESTINATION_TYPE = "place";
const QString OTHER_DESTINATION_TYPE = "coordinate_or_username";
const QString COORDINATE_DESTINATION_TYPE = "coordinate";
if (destination.startsWith("@")) {
// remove '@' and go to user
@ -73,45 +67,37 @@ void LocationManager::goTo(QString destination) {
return;
}
if (destination.startsWith("#")) {
// remove '#' and go to named place
QString destinationPlace = destination.remove(0, 1);
UserActivityLogger::getInstance().wentTo(PLACE_DESTINATION_TYPE, destinationPlace);
goToPlace(destinationPlace);
return;
}
// go to coordinate destination or to Username
if (!goToDestination(destination)) {
destination = QString(QUrl::toPercentEncoding(destination));
UserActivityLogger::getInstance().wentTo(OTHER_DESTINATION_TYPE, destination);
UserActivityLogger::getInstance().wentTo(PLACE_DESTINATION_TYPE, destination);
JSONCallbackParameters callbackParams;
callbackParams.jsonCallbackReceiver = this;
callbackParams.jsonCallbackMethod = "goToAddressFromResponse";
callbackParams.jsonCallbackMethod = "goToPlaceFromResponse";
callbackParams.errorCallbackReceiver = this;
callbackParams.errorCallbackMethod = "handleAddressLookupError";
AccountManager::getInstance().authenticatedRequest(GET_ADDRESSES.arg(destination),
AccountManager::getInstance().authenticatedRequest(GET_PLACE_ADDRESS.arg(destination),
QNetworkAccessManager::GetOperation,
callbackParams);
} else {
UserActivityLogger::getInstance().wentTo(COORDINATE_DESTINATION_TYPE, destination);
}
}
void LocationManager::goToAddressFromResponse(const QJsonObject& responseData) {
void LocationManager::goToPlaceFromResponse(const QJsonObject& responseData) {
QJsonValue status = responseData["status"];
const QJsonObject& data = responseData["data"].toObject();
const QJsonValue& userObject = data["user"];
const QJsonValue& placeObject = data["place"];
QJsonObject data = responseData["data"].toObject();
QJsonObject domainObject = data["domain"].toObject();
if (!placeObject.isUndefined() && !userObject.isUndefined()) {
emit multipleDestinationsFound(userObject.toObject(), placeObject.toObject());
} else if (placeObject.isUndefined()) {
Application::getInstance()->getAvatar()->goToLocationFromAddress(userObject.toObject()["address"].toObject());
} else {
Application::getInstance()->getAvatar()->goToLocationFromAddress(placeObject.toObject()["address"].toObject());
}
const QString DOMAIN_NETWORK_ADDRESS_KEY = "network_address";
// get the network address for the domain we need to switch to
NodeList::getInstance()->getDomainHandler().setHostname(domainObject[DOMAIN_NETWORK_ADDRESS_KEY].toString());
// check if there is a path inside the domain we need to jump to
}
void LocationManager::goToUser(QString userName) {
@ -140,6 +126,46 @@ void LocationManager::goToPlace(QString placeName) {
callbackParams);
}
void LocationManager::goToUrl(const QUrl& url) {
// if (location.startsWith(CUSTOM_URL_SCHEME + "/")) {
// QStringList urlParts = location.remove(0, CUSTOM_URL_SCHEME.length()).split('/', QString::SkipEmptyParts);
//
// if (urlParts.count() > 1) {
// // if url has 2 or more parts, the first one is domain name
// QString domain = urlParts[0];
//
// // second part is either a destination coordinate or
// // a place name
// QString destination = urlParts[1];
//
// // any third part is an avatar orientation.
// QString orientation = urlParts.count() > 2 ? urlParts[2] : QString();
//
// goToDomain(domain);
//
// // goto either @user, #place, or x-xx,y-yy,z-zz
// // style co-ordinate.
// goTo(destination);
//
// if (!orientation.isEmpty()) {
// // location orientation
// goToOrientation(orientation);
// }
// } else if (urlParts.count() == 1) {
// QString destination = urlParts[0];
//
// // If this starts with # or @, treat it as a user/location, otherwise treat it as a domain
// if (destination[0] == '#' || destination[0] == '@') {
// goTo(destination);
// } else {
// goToDomain(destination);
// }
// }
// return true;
// }
// return false;
}
void LocationManager::goToOrientation(QString orientation) {
if (orientation.isEmpty()) {
return;

7
interface/src/location/LocationManager.h
View file

@ -29,12 +29,12 @@ public:
SystemError
};
LocationManager();
void createNamedLocation(NamedLocation* namedLocation);
void goTo(QString destination);
void goToUser(QString userName);
void goToPlace(QString placeName);
void goToUrl(const QUrl& url);
void goToOrientation(QString orientation);
bool goToDestination(QString destination);
@ -46,12 +46,11 @@ private:
signals:
void creationCompleted(LocationManager::NamedLocationCreateResponse response);
void multipleDestinationsFound(const QJsonObject& userData, const QJsonObject& placeData);
private slots:
void namedLocationDataReceived(const QJsonObject& data);
void errorDataReceived(QNetworkReply::NetworkError error, const QString& message);
void goToAddressFromResponse(const QJsonObject& jsonObject);
void goToPlaceFromResponse(const QJsonObject& jsonObject);
};

4
interface/src/ui/ChatMessageArea.cpp
View file

@ -19,8 +19,8 @@ ChatMessageArea::ChatMessageArea(bool useFixedHeight) : QTextBrowser(), _useFixe
connect(document()->documentLayout(), &QAbstractTextDocumentLayout::documentSizeChanged,
this, &ChatMessageArea::updateLayout);
connect(this, &QTextBrowser::anchorClicked,
Menu::getInstance(), &Menu::openUrl);
// connect(this, &QTextBrowser::anchorClicked,
// Menu::getInstance(), &Menu::openUrl);
}
void ChatMessageArea::setHtml(const QString& html) {

2
interface/src/ui/ChatWindow.cpp
View file

@ -169,7 +169,7 @@ bool ChatWindow::eventFilter(QObject* sender, QEvent* event) {
} else if (event->type() == QEvent::MouseButtonRelease) {
QVariant userVar = sender->property("user");
if (userVar.isValid()) {
Menu::getInstance()->goToUser("@" + userVar.toString());
// Menu::getInstance()->goToUser("@" + userVar.toString());
return true;
}
}

2
interface/src/ui/UserLocationsDialog.cpp
View file

@ -52,7 +52,7 @@ void UserLocationsDialog::updateEnabled() {
void UserLocationsDialog::goToModelIndex(const QModelIndex& index) {
QVariant location = _proxyModel.data(index.sibling(index.row(), UserLocationsModel::LocationColumn));
Menu::getInstance()->goToURL(location.toString());
// Menu::getInstance()->goToURL(location.toString());
}
void UserLocationsDialog::deleteSelection() {

108
libraries/networking/src/AddressManager.cpp Normal file
View file

@ -0,0 +1,108 @@
//
// AddressManager.cpp
// libraries/networking/src
//
// Created by Stephen Birarda on 2014-09-10.
// Copyright 2014 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#include <qdebug.h>
#include <qregexp.h>
#include <qstringlist.h>
#include "AddressManager.h"
AddressManager& AddressManager::getInstance() {
static AddressManager sharedInstance;
return sharedInstance;
}
void AddressManager::handleLookupString(const QString& lookupString) {
// there are 4 possible lookup strings
// 1. global place name (name of domain or place) - example: sanfrancisco
// 2. user name (prepended with @) - example: @philip
// 3. location string (posX,posY,posZ/eulerX,eulerY,eulerZ)
// 4. domain network address (IP or dns resolvable hostname)
// use our regex'ed helpers to figure out what we're supposed to do with this
if (!lookupHandledAsUsername(lookupString) &&
!lookupHandledAsNetworkAddress(lookupString) &&
!lookupHandledAsLocationString(lookupString)) {
}
}
bool AddressManager::lookupHandledAsNetworkAddress(const QString& lookupString) {
const QString IP_ADDRESS_REGEX_STRING = "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}"
"([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$";
const QString HOSTNAME_REGEX_STRING = "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*"
"([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\-]*[A-Za-z0-9])$";
return false;
}
bool AddressManager::lookupHandledAsLocationString(const QString& lookupString) {
const QString FLOAT_REGEX_STRING = "([-+]?[0-9]*\\.?[0-9]+(?:[eE][-+]?[0-9]+)?)";
const QString TRIPLE_FLOAT_REGEX_STRING = FLOAT_REGEX_STRING + "\\s*,\\s*" +
FLOAT_REGEX_STRING + "\\s*,\\s*" + FLOAT_REGEX_STRING + "\\s*(?:$|\\/)";
QRegExp tripleFloatRegex(TRIPLE_FLOAT_REGEX_STRING);
if (tripleFloatRegex.indexIn(lookupString) != -1) {
// we have at least a position, so emit our signal to say we need to change position
glm::vec3 newPosition(tripleFloatRegex.cap(1).toFloat(),
tripleFloatRegex.cap(2).toFloat(),
tripleFloatRegex.cap(3).toFloat());
if (newPosition.x != NAN && newPosition.y != NAN && newPosition.z != NAN) {
glm::vec3 newOrientation;
// we may also have an orientation
if (lookupString[tripleFloatRegex.matchedLength() - 1] == QChar('/')
&& tripleFloatRegex.indexIn(lookupString, tripleFloatRegex.matchedLength() - 1) != -1) {
glm::vec3 newOrientation(tripleFloatRegex.cap(1).toFloat(),
tripleFloatRegex.cap(2).toFloat(),
tripleFloatRegex.cap(3).toFloat());
if (newOrientation.x != NAN && newOrientation.y != NAN && newOrientation.z != NAN) {
emit locationChangeRequired(newPosition, true, newOrientation);
return true;
} else {
qDebug() << "Orientation parsed from lookup string is invalid. Will not use for location change.";
}
}
emit locationChangeRequired(newPosition, false, newOrientation);
} else {
qDebug() << "Could not jump to position from lookup string because it has an invalid value.";
}
return true;
}
return false;
}
bool AddressManager::lookupHandledAsUsername(const QString& lookupString) {
const QString USERNAME_REGEX_STRING = "^@(\\S+)$";
QRegExp usernameRegex(USERNAME_REGEX_STRING);
if (usernameRegex.indexIn(lookupString) != -1) {
// this is a username - pull the captured name and lookup that user's address
return true;
}
return false;
}

33
libraries/networking/src/AddressManager.h Normal file
View file

@ -0,0 +1,33 @@
//
// AddressManager.h
// libraries/networking/src
//
// Created by Stephen Birarda on 2014-09-10.
// Copyright 2014 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#ifndef hifi_AddressManager_h
#define hifi_AddressManager_h
#include <qobject.h>
#include <glm/glm.hpp>
class AddressManager : public QObject {
Q_OBJECT
public:
static AddressManager& getInstance();
void handleLookupString(const QString& lookupString);
signals:
void locationChangeRequired(const glm::vec3& newPosition, bool hasOrientationChange, const glm::vec3& newOrientation);
private:
bool lookupHandledAsNetworkAddress(const QString& lookupString);
bool lookupHandledAsLocationString(const QString& lookupString);
bool lookupHandledAsUsername(const QString& lookupString);
};
#endif // hifi_AddressManager_h

2
libraries/networking/src/LimitedNodeList.cpp
View file

@ -33,7 +33,7 @@ const char SOLO_NODE_TYPES[2] = {
NodeType::AudioMixer
};
const QUrl DEFAULT_NODE_AUTH_URL = QUrl("https://data.highfidelity.io");
const QUrl DEFAULT_NODE_AUTH_URL = QUrl("http://localhost:3000");
LimitedNodeList* LimitedNodeList::_sharedInstance = NULL;