Showing the changes to interface/src/Application.cpp (1 of 39 files). Show all
Unified · Split
| @@ -1489,11 +1489,15 @@ void Application::paintGL() { · 1488 unmodified lines | ||
| 1489 | 1489 | // FIXME not needed anymore? |
| 1490 | 1490 | _offscreenContext->makeCurrent(); |
| 1491 | 1491 | |
| 1492 | − displayPlugin->updateHeadPose(_frameCount); | |
| 1492 | + displayPlugin->beginFrameRender(_frameCount); | |
| 1493 | 1493 | |
| 1494 | 1494 | // update the avatar with a fresh HMD pose |
| 1495 | 1495 | getMyAvatar()->updateFromHMDSensorMatrix(getHMDSensorPose()); |
| 1496 | 1496 | |
| 1497 | + // update sensorToWorldMatrix for camera and hand controllers | |
| 1498 | + getMyAvatar()->updateSensorToWorldMatrix(); | |
| 1499 | + | |
| 1500 | + | |
| 1497 | 1501 | auto lodManager = DependencyManager::get<LODManager>(); |
| 1498 | 1502 | |
| 1499 | 1503 | |
| @@ -2006,6 +2010,12 @@ void Application::keyPressEvent(QKeyEvent* event) { · 506 unmodified lines | ||
| 2006 | 2010 | } |
| 2007 | 2011 | break; |
| 2008 | 2012 | |
| 2013 | + case Qt::Key_Y: | |
| 2014 | + if (isShifted && isMeta) { | |
| 2015 | + getActiveDisplayPlugin()->cycleDebugOutput(); | |
| 2016 | + } | |
| 2017 | + break; | |
| 2018 | + | |
| 2009 | 2019 | case Qt::Key_B: |
| 2010 | 2020 | if (isMeta) { |
| 2011 | 2021 | auto offscreenUi = DependencyManager::get<OffscreenUi>(); |
| @@ -2571,11 +2581,6 @@ void Application::idle(uint64_t now) { · 559 unmodified lines | ||
| 2571 | 2581 | return; // bail early, nothing to do here. |
| 2572 | 2582 | } |
| 2573 | 2583 | |
| 2574 | − checkChangeCursor(); | |
| 2575 | − | |
| 2576 | − Stats::getInstance()->updateStats(); | |
| 2577 | − AvatarInputs::getInstance()->update(); | |
| 2578 | − | |
| 2579 | 2584 | // These tasks need to be done on our first idle, because we don't want the showing of |
| 2580 | 2585 | // overlay subwindows to do a showDesktop() until after the first time through |
| 2581 | 2586 | static bool firstIdle = true; |
| @@ -2624,6 +2629,11 @@ void Application::idle(uint64_t now) { · 42 unmodified lines | ||
| 2624 | 2629 | // We're going to execute idle processing, so restart the last idle timer |
| 2625 | 2630 | _lastTimeUpdated.start(); |
| 2626 | 2631 | |
| 2632 | + checkChangeCursor(); | |
| 2633 | + | |
| 2634 | + Stats::getInstance()->updateStats(); | |
| 2635 | + AvatarInputs::getInstance()->update(); | |
| 2636 | + | |
| 2627 | 2637 | { |
| 2628 | 2638 | static uint64_t lastIdleStart{ now }; |
| 2629 | 2639 | uint64_t idleStartToStartDuration = now - lastIdleStart; |
| @@ -3390,9 +3400,6 @@ void Application::update(float deltaTime) { · 760 unmodified lines | ||
| 3390 | 3400 | |
| 3391 | 3401 | qApp->updateMyAvatarLookAtPosition(); |
| 3392 | 3402 | |
| 3393 | − // update sensorToWorldMatrix for camera and hand controllers | |
| 3394 | − myAvatar->updateSensorToWorldMatrix(); | |
| 3395 | − | |
| 3396 | 3403 | { |
| 3397 | 3404 | PROFILE_RANGE_EX("MyAvatar", 0xffff00ff, (uint64_t)getActiveDisplayPlugin()->presentCount()); |
| 3398 | 3405 | avatarManager->updateMyAvatar(deltaTime); |