History

getting dominant hand laser + sign up working

Wayne Chen committed 7 years ago

Commit cdee10d1 parent 4d550817 files · +65 −23Browse files

Showing the changes to interface/src/Application.cpp (1 of 7 files). Show all

Unified · Split

interface/src/Application.cpp+7−2
@@ -1316,6 +1316,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1315 unmodified lines
1316 connect(this, &Application::activeDisplayPluginChanged, this, &Application::updateSystemTabletMode);1316 connect(this, &Application::activeDisplayPluginChanged, this, &Application::updateSystemTabletMode);
1317 connect(this, &Application::activeDisplayPluginChanged, this, [&](){1317 connect(this, &Application::activeDisplayPluginChanged, this, [&](){
1318 auto dialogsManager = DependencyManager::get<DialogsManager>();1318 auto dialogsManager = DependencyManager::get<DialogsManager>();
1319 auto keyboard = DependencyManager::get<Keyboard>();
1319 if (getLoginDialogPoppedUp()) {1320 if (getLoginDialogPoppedUp()) {
1320 if (_firstRun.get()) {1321 if (_firstRun.get()) {
1321 // display mode changed. Don't allow auto-switch to work after this session.1322 // display mode changed. Don't allow auto-switch to work after this session.
@@ -1327,6 +1328,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 5 unmodified lines
1327 createLoginDialogOverlay();1328 createLoginDialogOverlay();
1328 } else {1329 } else {
1329 // Desktop mode.1330 // Desktop mode.
1331 QVariantMap properties{
1332 { "parentID", QUuid() }
1333 };
1334 getOverlays().editOverlay(keyboard->getAnchorID(), properties);
1330 getOverlays().deleteOverlay(_loginDialogOverlayID);1335 getOverlays().deleteOverlay(_loginDialogOverlayID);
1331 _loginDialogOverlayID = OverlayID();1336 _loginDialogOverlayID = OverlayID();
1332 _loginStateManager.tearDown();1337 _loginStateManager.tearDown();
@@ -6251,7 +6256,7 @@ void Application::update(float deltaTime) { · 4918 unmodified lines
6251 _overlays.update(deltaTime);6256 _overlays.update(deltaTime);
6252 }6257 }
6253 if (!_loginDialogOverlayID.isNull()) {6258 if (!_loginDialogOverlayID.isNull()) {
6254 _loginStateManager.update();6259 _loginStateManager.update(getMyAvatar()->getDominantHand());
6255 }6260 }
6256 6261
6257 if (!_loginDialogOverlayID.isNull()) {6262 if (!_loginDialogOverlayID.isNull()) {
@@ -8662,7 +8667,7 @@ void Application::createLoginDialogOverlay() { · 2404 unmodified lines
8662 QVariantMap properties {8667 QVariantMap properties {
8663 { "parentID", _loginDialogOverlayID },8668 { "parentID", _loginDialogOverlayID },
8664 { "localPosition", vec3toVariant(glm::vec3(-0.3f, -0.3f, 0.2f)) },8669 { "localPosition", vec3toVariant(glm::vec3(-0.3f, -0.3f, 0.2f)) },
8665 { "localOrientation", quatToVariant(glm::quat(0.0f, 0.0, 1.0f, 0.0f)) }8670 { "localOrientation", quatToVariant(glm::quat(0.0f, 0.0, 1.0f, 0.25f)) },
8666 };8671 };
8667 getOverlays().editOverlay(keyboard->getAnchorID(), properties);8672 getOverlays().editOverlay(keyboard->getAnchorID(), properties);
8668 keyboard->setResetKeyboardPositionOnRaise(false);8673 keyboard->setResetKeyboardPositionOnRaise(false);