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

fix node auth url, NAN break on windows

Browse source
This commit is contained in:
Stephen Birarda 2014-09-12 11:43:50 -07:00
parent 88a75a3585
commit 892e0e7cbf
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -190,7 +190,7 @@ bool AddressManager::handleRelativeViewpoint(const QString& lookupString) {
tripleFloatRegex.cap(2).toFloat(), tripleFloatRegex.cap(2).toFloat(),
tripleFloatRegex.cap(3).toFloat()); tripleFloatRegex.cap(3).toFloat());
if (newPosition.x != NAN && newPosition.y != NAN && newPosition.z != NAN) { if (!isNaN(newPosition.x) && !isNaN(newPosition.y) && !isNaN(newPosition.z)) {
glm::vec3 newOrientation; glm::vec3 newOrientation;
// we may also have an orientation // we may also have an orientation
if (lookupString[tripleFloatRegex.matchedLength() - 1] == QChar('/') if (lookupString[tripleFloatRegex.matchedLength() - 1] == QChar('/')
@ -200,7 +200,7 @@ bool AddressManager::handleRelativeViewpoint(const QString& lookupString) {
tripleFloatRegex.cap(2).toFloat(), tripleFloatRegex.cap(2).toFloat(),
tripleFloatRegex.cap(3).toFloat()); tripleFloatRegex.cap(3).toFloat());
if (newOrientation.x != NAN && newOrientation.y != NAN && newOrientation.z != NAN) { if (!isNaN(newOrientation.x) && !isNaN(newOrientation.y) && !isNaN(newOrientation.z)) {
emit locationChangeRequired(newPosition, true, newOrientation); emit locationChangeRequired(newPosition, true, newOrientation);
return true; return true;
} else { } else {

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

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