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

more wip

Browse source
This commit is contained in:
Wayne Chen 2018-11-01 17:16:15 -07:00
parent c28ed9fc4b
commit 7f805ebcb4
3 changed files with 88 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
interface/src/Application.cpp
View file

@ -1287,6 +1287,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
setCrashAnnotation("hmd", displayPlugin->isHmd() ? "1" : "0");
});
connect(this, &Application::activeDisplayPluginChanged, this, &Application::updateSystemTabletMode);
connect(this, &Application::activeDisplayPluginChanged, this, &Application::checkReadyToCreateLoginDialogOverlay);
// Save avatar location immediately after a teleport.
connect(myAvatar.get(), &MyAvatar::positionGoneTo,
@ -2838,6 +2839,8 @@ void Application::initializeDisplayPlugins() {
if (displayPlugin->isHmd()) {
QObject::connect(dynamic_cast<HmdDisplayPlugin*>(displayPlugin.get()), &HmdDisplayPlugin::hmdMountedChanged,
DependencyManager::get<HMDScriptingInterface>().data(), &HMDScriptingInterface::mountedChanged);
QObject::connect(dynamic_cast<HmdDisplayPlugin*>(displayPlugin.get()), &HmdDisplayPlugin::hmdMountedChanged,
this, &Application::checkReadyToCreateLoginDialogOverlay);
}
}
@ -5232,11 +5235,6 @@ void Application::pauseUntilLoginDetermined() {
menu->getMenu("View")->setVisible(false);
menu->getMenu("Navigate")->setVisible(false);
menu->getMenu("Settings")->setVisible(false);
{
auto scriptEngines = DependencyManager::get<ScriptEngines>().data();
scriptEngines->loadControllerScripts();
}
}
void Application::resumeAfterLoginDialogActionTaken() {
@ -8516,6 +8514,20 @@ void Application::setShowBulletConstraintLimits(bool value) {
_physicsEngine->setShowBulletConstraintLimits(value);
}
void Application::checkReadyToCreateLoginDialogOverlay() {
if (qApp->isHMDMode() && qApp->getActiveDisplayPlugin()->isDisplayVisible() && qApp->getLoginDialogPoppedUp() && _loginDialogOverlayID.isNull()) {
createLoginDialogOverlay();
} else if (qApp->getLoginDialogPoppedUp() && !qApp->isHMDMode()) {
auto pointer = DependencyManager::get<PointerScriptingInterface>().data();
if (_leftLoginPointerID > 0) {
pointer->disablePointer(_leftLoginPointerID);
}
if (_rightLoginPointerID > 0) {
pointer->disablePointer(_rightLoginPointerID);
}
}
}
void Application::createLoginDialogOverlay() {
auto avatarManager = DependencyManager::get<AvatarManager>();
auto myAvatar = avatarManager->getMyAvatar();
@ -8534,6 +8546,61 @@ void Application::createLoginDialogOverlay() {
{ "dpi", overlayDpi },
{ "visible", true }
};
auto pointer = DependencyManager::get<PointerScriptingInterface>().data();
auto standard = _controllerScriptingInterface->getStandard();
glm::vec3 grabPointSphereOffsetLeft { 0.04, 0.13, 0.039 }; // x = upward, y = forward, z = lateral
glm::vec3 grabPointSphereOffsetRight { -0.04, 0.13, 0.039 }; // x = upward, y = forward, z = lateral
QList<QVariant> leftPointerTriggerProperties;
QVariantMap ltClick1 {
{ "action", standard["LTClick"] },
{ "button", "Focus" }
};
QVariantMap ltClick2 {
{ "action", standard["LTClick"] },
{ "button", "Primary" }
};
leftPointerTriggerProperties.append(ltClick1);
leftPointerTriggerProperties.append(ltClick2);
const unsigned int leftHand = 0;
QVariantMap leftPointerProperties {
{ "joint", "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND" },
{ "filter", PickFilter::PICK_OVERLAYS },
{ "triggers", leftPointerTriggerProperties },
{ "posOffset", vec3toVariant(grabPointSphereOffsetLeft) },
{ "hover", true },
{ "distanceScaleEnd", true },
{ "hand", leftHand }
};
_leftLoginPointerID = pointer->createPointer(PickQuery::PickType::Ray, leftPointerProperties);
pointer->setRenderState(_leftLoginPointerID, "");
pointer->enablePointer(_leftLoginPointerID);
const unsigned int rightHand = 1;
QList<QVariant> rightPointerTriggerProperties;
QVariantMap rtClick1 {
{ "action", standard["RTClick"] },
{ "button", "Focus" }
};
QVariantMap rtClick2 {
{ "action", standard["RTClick"] },
{ "button", "Primary" }
};
rightPointerTriggerProperties.append(rtClick1);
rightPointerTriggerProperties.append(rtClick2);
QVariantMap rightPointerProperties{
{ "joint", "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND" },
{ "filter", PickFilter::PICK_OVERLAYS },
{ "triggers", rightPointerTriggerProperties },
{ "posOffset", vec3toVariant(grabPointSphereOffsetRight) },
{ "hover", true },
{ "distanceScaleEnd", true },
{ "hand", rightHand }
};
_rightLoginPointerID = pointer->createPointer(PickQuery::PickType::Ray, rightPointerProperties);
pointer->setRenderState(_rightLoginPointerID, "");
pointer->enablePointer(_rightLoginPointerID);
_loginDialogOverlayID = overlays.addOverlay("web3d", overlayProperties);
}
@ -8541,11 +8608,18 @@ void Application::createLoginDialogOverlay() {
void Application::onDismissedLoginDialog() {
_loginDialogPoppedUp = false;
loginDialogPoppedUp.set(false);
auto pointer = DependencyManager::get<PointerScriptingInterface>().data();
if (!_loginDialogOverlayID.isNull()) {
// deleting overlay.
qDebug() << "Deleting overlay";
getOverlays().deleteOverlay(_loginDialogOverlayID);
}
if (_leftLoginPointerID > 0) {
pointer->disablePointer(_leftLoginPointerID);
}
if (_rightLoginPointerID > 0) {
pointer->disablePointer(_rightLoginPointerID);
}
resumeAfterLoginDialogActionTaken();
}

7
interface/src/Application.h
View file

@ -320,6 +320,8 @@ public:
void setOtherAvatarsReplicaCount(int count) { DependencyManager::get<AvatarHashMap>()->setReplicaCount(count); }
bool getLoginDialogPoppedUp() const { return _loginDialogPoppedUp; }
// is only ready when user has mounted their headset and user is in HMD mode.
void checkReadyToCreateLoginDialogOverlay();
void createLoginDialogOverlay();
#if defined(Q_OS_ANDROID)
@ -682,9 +684,12 @@ private:
glm::uvec2 _renderResolution;
int _maxOctreePPS = DEFAULT_MAX_OCTREE_PPS;
bool _loginDialogPoppedUp = false;
bool _interstitialModeEnabled{ false };
bool _loginDialogPoppedUp = false;
OverlayID _loginDialogOverlayID;
unsigned int _leftLoginPointerID { PointerEvent::INVALID_POINTER_ID };
unsigned int _rightLoginPointerID { PointerEvent::INVALID_POINTER_ID };
quint64 _lastFaceTrackerUpdate;

8
interface/src/ui/LoginDialog.cpp
View file

@ -67,12 +67,10 @@ void LoginDialog::showWithSelection() {
}
}
} else {
if (qApp->getLoginDialogPoppedUp()) {
// pop up those overlay things.
qApp->createLoginDialogOverlay();
return;
} else {
if (!qApp->getLoginDialogPoppedUp()) {
tablet->initialScreen(TABLET_LOGIN_DIALOG_URL);
} else {
// let Application handle creating login dialog overlay.
}
}