Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all
Unified · Split
| @@ -2895,21 +2895,12 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 2894 unmodified lines | |||
| 2895 | "Application::displaySide() ... AmbientOcclusion..."); | 2895 | "Application::displaySide() ... AmbientOcclusion..."); |
| 2896 | _ambientOcclusionEffect.render(); | 2896 | _ambientOcclusionEffect.render(); |
| 2897 | } | 2897 | } |
| 2898 | |||
| 2899 | _nodeBoundsDisplay.draw(); | ||
| 2900 | |||
| 2901 | } | 2898 | } |
| 2902 | 2899 | ||
| 2903 | bool mirrorMode = (whichCamera.getInterpolatedMode() == CAMERA_MODE_MIRROR); | 2900 | bool mirrorMode = (whichCamera.getInterpolatedMode() == CAMERA_MODE_MIRROR); |
| 2904 | { | 2901 | { |
| 2905 | PerformanceTimer perfTimer("avatars"); | 2902 | PerformanceTimer perfTimer("avatars"); |
| 2906 | 2903 | _avatarManager.renderAvatars(mirrorMode ? Avatar::MIRROR_RENDER_MODE : Avatar::NORMAL_RENDER_MODE, selfAvatarOnly); | |
| 2907 | _avatarManager.renderAvatars(mirrorMode ? Avatar::MIRROR_RENDER_MODE : Avatar::NORMAL_RENDER_MODE, selfAvatarOnly); | ||
| 2908 | |||
| 2909 | //Render the sixense lasers | ||
| 2910 | if (Menu::getInstance()->isOptionChecked(MenuOption::SixenseLasers)) { | ||
| 2911 | _myAvatar->renderLaserPointers(); | ||
| 2912 | } | ||
| 2913 | } | 2904 | } |
| 2914 | 2905 | ||
| 2915 | { | 2906 | { |
| @@ -2917,7 +2908,14 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 1 unmodified line | |||
| 2917 | _deferredLightingEffect.render(); | 2908 | _deferredLightingEffect.render(); |
| 2918 | } | 2909 | } |
| 2919 | 2910 | ||
| 2911 | //Render the sixense lasers | ||
| 2912 | if (Menu::getInstance()->isOptionChecked(MenuOption::SixenseLasers)) { | ||
| 2913 | _myAvatar->renderLaserPointers(); | ||
| 2914 | } | ||
| 2915 | |||
| 2920 | if (!selfAvatarOnly) { | 2916 | if (!selfAvatarOnly) { |
| 2917 | _nodeBoundsDisplay.draw(); | ||
| 2918 | |||
| 2921 | // Render the world box | 2919 | // Render the world box |
| 2922 | if (whichCamera.getMode() != CAMERA_MODE_MIRROR && Menu::getInstance()->isOptionChecked(MenuOption::Stats) && | 2920 | if (whichCamera.getMode() != CAMERA_MODE_MIRROR && Menu::getInstance()->isOptionChecked(MenuOption::Stats) && |
| 2923 | Menu::getInstance()->isOptionChecked(MenuOption::UserInterface)) { | 2921 | Menu::getInstance()->isOptionChecked(MenuOption::UserInterface)) { |