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

Revert "Merge branch 'master' into fixGoToButtonInterstitial"

Browse source 
This reverts commit b4b0c519f3, reversing
changes made to aef3ed3e01.
This commit is contained in:
Wayne Chen 2018-09-13 17:21:29 -07:00
parent 40451a1fc1
commit 2b8aebdb6b
4 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
interface/resources/images/interstitialPage/goTo_button.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9 KiB

6
libraries/networking/src/DomainHandler.cpp
View file

@ -102,7 +102,6 @@ void DomainHandler::softReset() {
clearSettings(); clearSettings();
_isInErrorState = false;
_connectionDenialsSinceKeypairRegen = 0; _connectionDenialsSinceKeypairRegen = 0;
_checkInPacketsSinceLastReply = 0; _checkInPacketsSinceLastReply = 0;
@ -112,6 +111,7 @@ void DomainHandler::softReset() {
// restart the API refresh timer in case we fail to connect and need to refresh information // restart the API refresh timer in case we fail to connect and need to refresh information
if (!_isInErrorState) { if (!_isInErrorState) {
QMetaObject::invokeMethod(&_apiRefreshTimer, "start"); QMetaObject::invokeMethod(&_apiRefreshTimer, "start");
}
} }
void DomainHandler::hardReset() { void DomainHandler::hardReset() {
@ -343,6 +343,7 @@ void DomainHandler::loadedErrorDomain(std::map<QString, QString> namedPaths) {
void DomainHandler::setRedirectErrorState(QUrl errorUrl, int reasonCode) { void DomainHandler::setRedirectErrorState(QUrl errorUrl, int reasonCode) {
_errorDomainURL = errorUrl; _errorDomainURL = errorUrl;
_lastDomainConnectionError = reasonCode; _lastDomainConnectionError = reasonCode;
_isInErrorState = true;
emit redirectToErrorDomainURL(_errorDomainURL); emit redirectToErrorDomainURL(_errorDomainURL);
} }
@ -485,9 +486,8 @@ void DomainHandler::processDomainServerConnectionDeniedPacket(QSharedPointer<Rec
emit domainConnectionRefused(reasonMessage, (int)reasonCode, extraInfo); emit domainConnectionRefused(reasonMessage, (int)reasonCode, extraInfo);
#else #else
if (reasonCode == ConnectionRefusedReason::ProtocolMismatch || reasonCode == ConnectionRefusedReason::NotAuthorized) { if (reasonCode == ConnectionRefusedReason::ProtocolMismatch || reasonCode == ConnectionRefusedReason::NotAuthorized) {
_isInErrorState = true;
// ingest the error - this is a "hard" connection refusal. // ingest the error - this is a "hard" connection refusal.
emit redirectToErrorDomainURL(_errorDomainURL); setRedirectErrorState(_errorDomainURL, (int)reasonCode);
} else { } else {
emit domainConnectionRefused(reasonMessage, (int)reasonCode, extraInfo); emit domainConnectionRefused(reasonMessage, (int)reasonCode, extraInfo);
} }

2
libraries/networking/src/DomainHandler.h
View file

@ -87,8 +87,6 @@ public:
void connectedToServerless(std::map<QString, QString> namedPaths); void connectedToServerless(std::map<QString, QString> namedPaths);
void loadedErrorDomain(std::map<QString, QString> namedPaths); void loadedErrorDomain(std::map<QString, QString> namedPaths);
// sets domain handler in error state.
void setRedirectErrorState(QUrl errorUrl, int reasonCode);
QString getViewPointFromNamedPath(QString namedPath); QString getViewPointFromNamedPath(QString namedPath);

10
scripts/system/interstitialPage.js
View file

@ -137,10 +137,10 @@
var loadingToTheSpotID = Overlays.addOverlay("image3d", { var loadingToTheSpotID = Overlays.addOverlay("image3d", {
name: "Loading-Destination-Card-Text", name: "Loading-Destination-Card-Text",
localPosition: { x: 0.0 , y: -1.5, z: -0.3 }, localPosition: { x: 0.0 , y: -1.8, z: 0.0 },
url: Script.resourcesPath() + "images/interstitialPage/goTo_button.png", url: "http://hifi-content.s3.amazonaws.com/alexia/LoadingScreens/goTo_button.png",
alpha: 1, alpha: 1,
dimensions: { x: 1.5, y: 1.0 }, dimensions: { x: 1.2, y: 0.6},
visible: isVisible, visible: isVisible,
emissive: true, emissive: true,
ignoreRayIntersection: false, ignoreRayIntersection: false,
@ -415,13 +415,13 @@
Overlays.mouseReleaseOnOverlay.connect(clickedOnOverlay); Overlays.mouseReleaseOnOverlay.connect(clickedOnOverlay);
Overlays.hoverEnterOverlay.connect(function(overlayID, event) { Overlays.hoverEnterOverlay.connect(function(overlayID, event) {
if (overlayID === loadingToTheSpotID) { if (overlayID === loadingToTheSpotID) {
Overlays.editOverlay(loadingToTheSpotID, { color: greyColor }); Overlays.editOverlay(loadingToTheSpotID, { color: greyColor});
} }
}); });
Overlays.hoverLeaveOverlay.connect(function(overlayID, event) { Overlays.hoverLeaveOverlay.connect(function(overlayID, event) {
if (overlayID === loadingToTheSpotID) { if (overlayID === loadingToTheSpotID) {
Overlays.editOverlay(loadingToTheSpotID, { color: whiteColor }); Overlays.editOverlay(loadingToTheSpotID, { color: whiteColor});
} }
}); });