Showing the changes to interface/src/Application.cpp (1 of 11 files). Show all
Unified · Split
| @@ -609,12 +609,6 @@ void Application::keyPressEvent(QKeyEvent* event) { · 608 unmodified lines | |||
| 609 | return; | 609 | return; |
| 610 | } | 610 | } |
| 611 | 611 | ||
| 612 | //this is for switching between modes for the leap rave glove test | ||
| 613 | if (Menu::getInstance()->isOptionChecked(MenuOption::SimulateLeapHand) | ||
| 614 | || Menu::getInstance()->isOptionChecked(MenuOption::TestRaveGlove)) { | ||
| 615 | _myAvatar.getHand().setRaveGloveEffectsMode((QKeyEvent*)event); | ||
| 616 | } | ||
| 617 | |||
| 618 | bool isShifted = event->modifiers().testFlag(Qt::ShiftModifier); | 612 | bool isShifted = event->modifiers().testFlag(Qt::ShiftModifier); |
| 619 | bool isMeta = event->modifiers().testFlag(Qt::ControlModifier); | 613 | bool isMeta = event->modifiers().testFlag(Qt::ControlModifier); |
| 620 | switch (event->key()) { | 614 | switch (event->key()) { |
| @@ -2252,7 +2246,6 @@ void Application::updateLeap(float deltaTime) { · 1631 unmodified lines | |||
| 2252 | PerformanceWarning warn(showWarnings, "Application::updateLeap()"); | 2246 | PerformanceWarning warn(showWarnings, "Application::updateLeap()"); |
| 2253 | 2247 | ||
| 2254 | LeapManager::enableFakeFingers(Menu::getInstance()->isOptionChecked(MenuOption::SimulateLeapHand)); | 2248 | LeapManager::enableFakeFingers(Menu::getInstance()->isOptionChecked(MenuOption::SimulateLeapHand)); |
| 2255 | _myAvatar.getHand().setRaveGloveActive(Menu::getInstance()->isOptionChecked(MenuOption::TestRaveGlove)); | ||
| 2256 | LeapManager::nextFrame(); | 2249 | LeapManager::nextFrame(); |
| 2257 | } | 2250 | } |
| 2258 | 2251 | ||
| @@ -3086,12 +3079,8 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 827 unmodified lines | |||
| 3086 | } | 3079 | } |
| 3087 | } | 3080 | } |
| 3088 | 3081 | ||
| 3089 | _myAvatar.renderScreenTint(SCREEN_TINT_BEFORE_AVATARS); | ||
| 3090 | |||
| 3091 | renderAvatars(whichCamera.getMode() == CAMERA_MODE_MIRROR, selfAvatarOnly); | 3082 | renderAvatars(whichCamera.getMode() == CAMERA_MODE_MIRROR, selfAvatarOnly); |
| 3092 | 3083 | ||
| 3093 | _myAvatar.renderScreenTint(SCREEN_TINT_AFTER_AVATARS); | ||
| 3094 | |||
| 3095 | if (!selfAvatarOnly) { | 3084 | if (!selfAvatarOnly) { |
| 3096 | // Render the world box | 3085 | // Render the world box |
| 3097 | if (whichCamera.getMode() != CAMERA_MODE_MIRROR && Menu::getInstance()->isOptionChecked(MenuOption::Stats)) { | 3086 | if (whichCamera.getMode() != CAMERA_MODE_MIRROR && Menu::getInstance()->isOptionChecked(MenuOption::Stats)) { |