mirror of
https://github.com/overte-org/overte.git
synced 2025-04-25 20:16:16 +02:00
adding prototype functions
This commit is contained in:
parent
955b0a580e
commit
c4aabfda44
4 changed files with 25 additions and 8 deletions
|
@ -5181,6 +5181,12 @@ void Application::init() {
|
|||
_entitySimulation->setWorkloadSpace(getEntities()->getWorkloadSpace());
|
||||
}
|
||||
|
||||
void Application::pauseUntilLoginDetermined() {
|
||||
}
|
||||
|
||||
void Application::resumeAfterLoginDialogActionTaken() {
|
||||
}
|
||||
|
||||
void Application::loadAvatarScripts(const QVector<QString>& urls) {
|
||||
auto scriptEngines = DependencyManager::get<ScriptEngines>();
|
||||
auto runningScripts = scriptEngines->getRunningScripts();
|
||||
|
@ -8398,6 +8404,7 @@ void Application::onDismissedLoginDialog() {
|
|||
qDebug() << "dismissed login dialog";
|
||||
_loginDialogPoppedUp = false;
|
||||
loginDialogPoppedUp.set(false);
|
||||
resumeAfterLoginDialogActionTaken();
|
||||
}
|
||||
|
||||
void Application::startHMDStandBySession() {
|
||||
|
|
|
@ -320,8 +320,6 @@ public:
|
|||
void setOtherAvatarsReplicaCount(int count) { DependencyManager::get<AvatarHashMap>()->setReplicaCount(count); }
|
||||
|
||||
bool getLoginDialogPoppedUp() const { return _loginDialogPoppedUp; }
|
||||
void pauseUntilLoginDetermined();
|
||||
void resumeAfterLoginDialogActionTaken();
|
||||
|
||||
#if defined(Q_OS_ANDROID)
|
||||
void beforeEnterBackground();
|
||||
|
@ -514,6 +512,8 @@ private slots:
|
|||
|
||||
private:
|
||||
void init();
|
||||
void pauseUntilLoginDetermined();
|
||||
void resumeAfterLoginDialogActionTaken();
|
||||
bool handleKeyEventForFocusedEntityOrOverlay(QEvent* event);
|
||||
bool handleFileOpenEvent(QFileOpenEvent* event);
|
||||
void cleanupBeforeQuit();
|
||||
|
|
|
@ -26,6 +26,8 @@
|
|||
#include "Menu.h"
|
||||
|
||||
#include "Application.h"
|
||||
#include "overlays/Overlays.h"
|
||||
#include "overlays/Web3DOverlay.h"
|
||||
#include "scripting/HMDScriptingInterface.h"
|
||||
#include "Constants.h"
|
||||
|
||||
|
@ -63,12 +65,13 @@ void LoginDialog::showWithSelection() {
|
|||
}
|
||||
}
|
||||
} else {
|
||||
//if (qApp->getLoginDialogPoppedUp()) {
|
||||
// // pop up those overlay things.
|
||||
// return;
|
||||
//} else {
|
||||
// tablet->initialScreen(url);
|
||||
//}
|
||||
if (qApp->getLoginDialogPoppedUp()) {
|
||||
// pop up those overlay things.
|
||||
createLoginScreenDialog();
|
||||
return;
|
||||
} else {
|
||||
tablet->initialScreen(url);
|
||||
}
|
||||
|
||||
}
|
||||
if (!hmd->getShouldShowTablet()) {
|
||||
|
@ -252,6 +255,10 @@ bool LoginDialog::getLoginDialogPoppedUp() const {
|
|||
return qApp->getLoginDialogPoppedUp();
|
||||
}
|
||||
|
||||
void LoginDialog::createLoginScreenDialog() {
|
||||
|
||||
}
|
||||
|
||||
QString errorStringFromAPIObject(const QJsonValue& apiObject) {
|
||||
if (apiObject.isArray()) {
|
||||
return apiObject.toArray()[0].toString();
|
||||
|
|
|
@ -76,8 +76,11 @@ protected slots:
|
|||
Q_INVOKABLE bool getLoginDialogPoppedUp() const;
|
||||
|
||||
private:
|
||||
static void createLoginScreenDialog();
|
||||
|
||||
bool getIsLogIn() const { return _isLogIn; }
|
||||
void setIsLogIn(const bool isLogIn) { _isLogIn = isLogIn; }
|
||||
|
||||
bool _isLogIn { false };
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue