Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all
Unified · Split
| @@ -686,9 +686,7 @@ void Application::keyPressEvent(QKeyEvent* event) { · 685 unmodified lines | |||
| 686 | break; | 686 | break; |
| 687 | 687 | ||
| 688 | case Qt::Key_C: | 688 | case Qt::Key_C: |
| 689 | if (isShifted) { | 689 | if (_nudgeStarted) { |
| 690 | Menu::getInstance()->triggerOption(MenuOption::OcclusionCulling); | ||
| 691 | } else if (_nudgeStarted) { | ||
| 692 | _nudgeGuidePosition.y -= _mouseVoxel.s; | 690 | _nudgeGuidePosition.y -= _mouseVoxel.s; |
| 693 | } else { | 691 | } else { |
| 694 | _myAvatar.setDriveKeys(DOWN, 1); | 692 | _myAvatar.setDriveKeys(DOWN, 1); |
| @@ -2580,10 +2578,10 @@ void Application::queryVoxels() { · 1885 unmodified lines | |||
| 2580 | bool wantExtraDebugging = Menu::getInstance()->isOptionChecked(MenuOption::ExtraDebugging); | 2578 | bool wantExtraDebugging = Menu::getInstance()->isOptionChecked(MenuOption::ExtraDebugging); |
| 2581 | 2579 | ||
| 2582 | // These will be the same for all servers, so we can set them up once and then reuse for each server we send to. | 2580 | // These will be the same for all servers, so we can set them up once and then reuse for each server we send to. |
| 2583 | _voxelQuery.setWantLowResMoving(Menu::getInstance()->isOptionChecked(MenuOption::LowRes)); | 2581 | _voxelQuery.setWantLowResMoving(!Menu::getInstance()->isOptionChecked(MenuOption::DisableLowRes)); |
| 2584 | _voxelQuery.setWantColor(Menu::getInstance()->isOptionChecked(MenuOption::SendVoxelColors)); | 2582 | _voxelQuery.setWantColor(!Menu::getInstance()->isOptionChecked(MenuOption::DisableColorVoxels)); |
| 2585 | _voxelQuery.setWantDelta(Menu::getInstance()->isOptionChecked(MenuOption::DeltaSending)); | 2583 | _voxelQuery.setWantDelta(!Menu::getInstance()->isOptionChecked(MenuOption::DisableDeltaSending)); |
| 2586 | _voxelQuery.setWantOcclusionCulling(Menu::getInstance()->isOptionChecked(MenuOption::OcclusionCulling)); | 2584 | _voxelQuery.setWantOcclusionCulling(Menu::getInstance()->isOptionChecked(MenuOption::EnableOcclusionCulling)); |
| 2587 | 2585 | ||
| 2588 | _voxelQuery.setCameraPosition(_viewFrustum.getPosition()); | 2586 | _voxelQuery.setCameraPosition(_viewFrustum.getPosition()); |
| 2589 | _voxelQuery.setCameraOrientation(_viewFrustum.getOrientation()); | 2587 | _voxelQuery.setCameraOrientation(_viewFrustum.getOrientation()); |