Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-16 00:56:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix AddressManager not always storing history when it should

Browse source
This commit is contained in:
Ryan Huffman 2016-05-04 15:46:26 -07:00
parent fde1f0740c
commit f213a059fb
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libraries/networking/src/AddressManager.cpp
View file

@ -310,7 +310,7 @@ void AddressManager::goToAddressFromObject(const QVariantMap& dataObject, const
if (!returnedPath.isEmpty()) { if (!returnedPath.isEmpty()) {
if (shouldFaceViewpoint) { if (shouldFaceViewpoint) {
// try to parse this returned path as a viewpoint, that's the only thing it could be for now // try to parse this returned path as a viewpoint, that's the only thing it could be for now
if (!handleViewpoint(returnedPath, shouldFaceViewpoint)) { if (!handleViewpoint(returnedPath, shouldFaceViewpoint, trigger)) {
qCDebug(networking) << "Received a location path that was could not be handled as a viewpoint -" qCDebug(networking) << "Received a location path that was could not be handled as a viewpoint -"
<< returnedPath; << returnedPath;
} }
@ -446,7 +446,7 @@ bool AddressManager::handleDomainID(const QString& host) {
} }
void AddressManager::handlePath(const QString& path, LookupTrigger trigger, bool wasPathOnly) { void AddressManager::handlePath(const QString& path, LookupTrigger trigger, bool wasPathOnly) {
if (!handleViewpoint(path, false, wasPathOnly)) { if (!handleViewpoint(path, false, trigger, wasPathOnly)) {
qCDebug(networking) << "User entered path could not be handled as a viewpoint - " << path << qCDebug(networking) << "User entered path could not be handled as a viewpoint - " << path <<
"- wll attempt to ask domain-server to resolve."; "- wll attempt to ask domain-server to resolve.";
@ -463,7 +463,7 @@ void AddressManager::handlePath(const QString& path, LookupTrigger trigger, bool
} }
} }
bool AddressManager::handleViewpoint(const QString& viewpointString, bool shouldFace, bool AddressManager::handleViewpoint(const QString& viewpointString, bool shouldFace, LookupTrigger trigger,
bool definitelyPathOnly, const QString& pathString) { bool definitelyPathOnly, const QString& pathString) {
const QString FLOAT_REGEX_STRING = "([-+]?[0-9]*\\.?[0-9]+(?:[eE][-+]?[0-9]+)?)"; const QString FLOAT_REGEX_STRING = "([-+]?[0-9]*\\.?[0-9]+(?:[eE][-+]?[0-9]+)?)";
const QString SPACED_COMMA_REGEX_STRING = "\\s*,\\s*"; const QString SPACED_COMMA_REGEX_STRING = "\\s*,\\s*";
@ -491,8 +491,9 @@ bool AddressManager::handleViewpoint(const QString& viewpointString, bool should
// before moving to a new host thanks to the information in the same lookup URL. // before moving to a new host thanks to the information in the same lookup URL.
if (definitelyPathOnly || (!pathString.isEmpty() && pathString != _newHostLookupPath)) { if (definitelyPathOnly || (!pathString.isEmpty() && pathString != _newHostLookupPath)
addCurrentAddressToHistory(LookupTrigger::UserInput); || trigger == Back || trigger == Forward) {
addCurrentAddressToHistory(trigger);
} }
if (!isNaN(newPosition.x) && !isNaN(newPosition.y) && !isNaN(newPosition.z)) { if (!isNaN(newPosition.x) && !isNaN(newPosition.y) && !isNaN(newPosition.z)) {
@ -599,7 +600,7 @@ void AddressManager::copyPath() {
void AddressManager::addCurrentAddressToHistory(LookupTrigger trigger) { void AddressManager::addCurrentAddressToHistory(LookupTrigger trigger) {
// if we're cold starting and this is called for the first address (from settings) we don't do anything // if we're cold starting and this is called for the first address (from settings) we don't do anything
if (trigger != LookupTrigger::StartupFromSettings) { if (trigger != LookupTrigger::StartupFromSettings && trigger != LookupTrigger::DomainPathResponse) {
if (trigger == LookupTrigger::Back) { if (trigger == LookupTrigger::Back) {
// we're about to push to the forward stack // we're about to push to the forward stack
// if it's currently empty emit our signal to say that going forward is now possible // if it's currently empty emit our signal to say that going forward is now possible

7
libraries/networking/src/AddressManager.h
View file

@ -46,7 +46,8 @@ public:
UserInput, UserInput,
Back, Back,
Forward, Forward,
StartupFromSettings StartupFromSettings,
DomainPathResponse
}; };
bool isConnected(); bool isConnected();
@ -77,7 +78,7 @@ public slots:
// we currently expect this to be called from NodeList once handleLookupString has been called with a path // we currently expect this to be called from NodeList once handleLookupString has been called with a path
bool goToViewpointForPath(const QString& viewpointString, const QString& pathString) bool goToViewpointForPath(const QString& viewpointString, const QString& pathString)
{ return handleViewpoint(viewpointString, false, false, pathString); } { return handleViewpoint(viewpointString, false, DomainPathResponse, false, pathString); }
void goBack(); void goBack();
void goForward(); void goForward();
@ -125,7 +126,7 @@ private:
bool handleNetworkAddress(const QString& lookupString, LookupTrigger trigger); bool handleNetworkAddress(const QString& lookupString, LookupTrigger trigger);
void handlePath(const QString& path, LookupTrigger trigger, bool wasPathOnly = false); void handlePath(const QString& path, LookupTrigger trigger, bool wasPathOnly = false);
bool handleViewpoint(const QString& viewpointString, bool shouldFace = false, bool handleViewpoint(const QString& viewpointString, bool shouldFace, LookupTrigger trigger,
bool definitelyPathOnly = false, const QString& pathString = QString()); bool definitelyPathOnly = false, const QString& pathString = QString());
bool handleUsername(const QString& lookupString); bool handleUsername(const QString& lookupString);
bool handleDomainID(const QString& host); bool handleDomainID(const QString& host);