Showing the changes to interface/src/Application.cpp (1 of 16 files). Show all
Unified · Split
| @@ -3083,7 +3083,7 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly, RenderAr · 3082 unmodified lines | |||
| 3083 | // draw a red sphere | 3083 | // draw a red sphere |
| 3084 | float originSphereRadius = 0.05f; | 3084 | float originSphereRadius = 0.05f; |
| 3085 | glColor3f(1,0,0); | 3085 | glColor3f(1,0,0); |
| 3086 | _geometryCache.renderSphere(originSphereRadius, 15, 15); | 3086 | GeometryCache::getInstance()->renderSphere(originSphereRadius, 15, 15); |
| 3087 | 3087 | ||
| 3088 | // Draw voxels | 3088 | // Draw voxels |
| 3089 | if (Menu::getInstance()->isOptionChecked(MenuOption::Voxels)) { | 3089 | if (Menu::getInstance()->isOptionChecked(MenuOption::Voxels)) { |
| @@ -3304,12 +3304,12 @@ void Application::renderRearViewMirror(const QRect& region, bool billboard) { · 214 unmodified lines | |||
| 3304 | 3304 | ||
| 3305 | // set the bounds of rear mirror view | 3305 | // set the bounds of rear mirror view |
| 3306 | if (billboard) { | 3306 | if (billboard) { |
| 3307 | QSize size = getTextureCache()->getFrameBufferSize(); | 3307 | QSize size = TextureCache::getInstance()->getFrameBufferSize(); |
| 3308 | glViewport(region.x(), size.height() - region.y() - region.height(), region.width(), region.height()); | 3308 | glViewport(region.x(), size.height() - region.y() - region.height(), region.width(), region.height()); |
| 3309 | glScissor(region.x(), size.height() - region.y() - region.height(), region.width(), region.height()); | 3309 | glScissor(region.x(), size.height() - region.y() - region.height(), region.width(), region.height()); |
| 3310 | } else { | 3310 | } else { |
| 3311 | // if not rendering the billboard, the region is in device independent coordinates; must convert to device | 3311 | // if not rendering the billboard, the region is in device independent coordinates; must convert to device |
| 3312 | QSize size = getTextureCache()->getFrameBufferSize(); | 3312 | QSize size = TextureCache::getInstance()->getFrameBufferSize(); |
| 3313 | float ratio = QApplication::desktop()->windowHandle()->devicePixelRatio() * getRenderResolutionScale(); | 3313 | float ratio = QApplication::desktop()->windowHandle()->devicePixelRatio() * getRenderResolutionScale(); |
| 3314 | int x = region.x() * ratio, y = region.y() * ratio, width = region.width() * ratio, height = region.height() * ratio; | 3314 | int x = region.x() * ratio, y = region.y() * ratio, width = region.width() * ratio, height = region.height() * ratio; |
| 3315 | glViewport(x, size.height() - y - height, width, height); | 3315 | glViewport(x, size.height() - y - height, width, height); |