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

revert some changes and fix toolbar issue

Browse source
This commit is contained in:
Dante Ruiz 2018-08-22 15:20:56 -07:00
parent 535fdf32cf
commit 78458d62de
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Application.cpp
View file

@ -3458,7 +3458,8 @@ void Application::setIsInterstitialMode(bool interstitialMode) {
bool interstitialModeEnabled = menu->isOptionChecked("Enable Interstitial"); bool interstitialModeEnabled = menu->isOptionChecked("Enable Interstitial");
if (_interstitialMode != interstitialMode && interstitialModeEnabled) { if (_interstitialMode != interstitialMode && interstitialModeEnabled) {
_interstitialMode = interstitialMode; _interstitialMode = interstitialMode;
menu->setIsOptionChecked(MenuOption::Overlays, !_interstitialMode);
DependencyManager::get<OffscreenUi>()->setPinned(_interstitialMode);
emit interstitialModeChanged(_interstitialMode); emit interstitialModeChanged(_interstitialMode);
} }
} }

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

@ -127,8 +127,6 @@ float SafeLanding::loadingProgressPercentage() {
Locker lock(_lock); Locker lock(_lock);
if (_maxTrackedEntityCount > 0) { if (_maxTrackedEntityCount > 0) {
float trackedEntityCount = (float)_trackedEntities.size(); float trackedEntityCount = (float)_trackedEntities.size();
qDebug() << "pocessed: " << (_maxTrackedEntityCount - trackedEntityCount) << " -> total: " << _maxTrackedEntityCount;
qDebug() << ((_maxTrackedEntityCount - trackedEntityCount) / _maxTrackedEntityCount);
return ((_maxTrackedEntityCount - trackedEntityCount) / _maxTrackedEntityCount); return ((_maxTrackedEntityCount - trackedEntityCount) / _maxTrackedEntityCount);
} }

2
scripts/system/interstitialPage.js
View file

@ -27,6 +27,7 @@
var DEFAULT_Z_OFFSET = 5.45; var DEFAULT_Z_OFFSET = 5.45;
var renderViewTask = Render.getConfig("RenderMainView"); var renderViewTask = Render.getConfig("RenderMainView");
var toolbar = Toolbars.getToolbar("com.highfidelity.interface.toolbar.system");
var request = Script.require('request').request; var request = Script.require('request').request;
var BUTTON_PROPERTIES = { var BUTTON_PROPERTIES = {
text: "Interstitial" text: "Interstitial"
@ -336,6 +337,7 @@
Overlays.editOverlay(loadingBarProgress, loadingBarProperties); Overlays.editOverlay(loadingBarProgress, loadingBarProperties);
if (physicsEnabled) { if (physicsEnabled) {
toolbar.writeProperty("visible", true);
resetValues(); resetValues();
} }