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

removing unused variable

Browse source
This commit is contained in:
Wayne Chen 2018-10-04 23:11:27 -07:00
parent fc17e0ea16
commit 8abbd51bb1
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/octree/SafeLanding.cpp
View file

@ -189,10 +189,8 @@ bool SafeLanding::isEntityLoadingComplete() {
bool isVisuallyReady = true; bool isVisuallyReady = true;
if (enableInterstitial) { if (enableInterstitial) {
bool hasRenderable = true;
auto entityRenderable = entityTree->renderableForEntityId(entityMapIter->first); auto entityRenderable = entityTree->renderableForEntityId(entityMapIter->first);
if (!entityRenderable) { if (!entityRenderable) {
hasRenderable = false;
entityTree->addingEntity(entityMapIter->first); entityTree->addingEntity(entityMapIter->first);
} }

16
scripts/system/redirectOverlays.js
View file

@ -14,6 +14,7 @@
var hardRefusalErrors = [PROTOCOL_VERSION_MISMATCH, var hardRefusalErrors = [PROTOCOL_VERSION_MISMATCH,
NOT_AUTHORIZED, TIMEOUT]; NOT_AUTHORIZED, TIMEOUT];
var timer = null; var timer = null;
var isErrorState = false;
function getOopsText() { function getOopsText() {
var error = Window.getLastDomainConnectionError(); var error = Window.getLastDomainConnectionError();
@ -131,6 +132,7 @@
}); });
function toggleOverlays(isInErrorState) { function toggleOverlays(isInErrorState) {
isErrorState = isInErrorState;
if (!isInErrorState) { if (!isInErrorState) {
var properties = { var properties = {
visible: false visible: false
@ -148,6 +150,8 @@
var oopsText = getOopsText(); var oopsText = getOopsText();
// if oopsText === "", it was a success. // if oopsText === "", it was a success.
var overlaysVisible = (oopsText !== ""); var overlaysVisible = (oopsText !== "");
// for catching init or if error state were to be different.
isErrorState = overlaysVisible;
var properties = { var properties = {
visible: overlaysVisible visible: overlaysVisible
}; };
@ -218,6 +222,10 @@
Overlays.mouseReleaseOnOverlay.connect(clickedOnOverlay); Overlays.mouseReleaseOnOverlay.connect(clickedOnOverlay);
Overlays.hoverEnterOverlay.connect(function(overlayID, event) { Overlays.hoverEnterOverlay.connect(function(overlayID, event) {
if (!isErrorState) {
// don't allow hover overlay events to get caught if it's not in error state anymore.
return;
}
if (overlayID === backImageNeutral && location.canGoBack()) { if (overlayID === backImageNeutral && location.canGoBack()) {
Overlays.editOverlay(backImageNeutral, {visible: false}); Overlays.editOverlay(backImageNeutral, {visible: false});
Overlays.editOverlay(backImageHover, {visible: true}); Overlays.editOverlay(backImageHover, {visible: true});
@ -229,11 +237,15 @@
}); });
Overlays.hoverLeaveOverlay.connect(function(overlayID, event) { Overlays.hoverLeaveOverlay.connect(function(overlayID, event) {
if (overlayID === backImageHover && Overlays.getProperty(backImageHover, "visible")) { if (!isErrorState) {
// don't allow hover overlay events to get caught if it's not in error state anymore.
return;
}
if (overlayID === backImageHover) {
Overlays.editOverlay(backImageHover, {visible: false}); Overlays.editOverlay(backImageHover, {visible: false});
Overlays.editOverlay(backImageNeutral, {visible: true}); Overlays.editOverlay(backImageNeutral, {visible: true});
} }
if (overlayID === tryAgainImageHover && Overlays.getProperty(tryAgainImageHover, "visible")) { if (overlayID === tryAgainImageHover) {
Overlays.editOverlay(tryAgainImageHover, {visible: false}); Overlays.editOverlay(tryAgainImageHover, {visible: false});
Overlays.editOverlay(tryAgainImageNeutral, {visible: true}); Overlays.editOverlay(tryAgainImageNeutral, {visible: true});
} }