History

more render util cleanup

ZappoMan committed 11 years ago

Commit 4ac673f1 parent e9ea6b216 files · +38 −34Browse files

Showing the changes to interface/src/Application.cpp (1 of 16 files). Show all

Unified · Split

interface/src/Application.cpp+3−3
@@ -3083,7 +3083,7 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly, RenderAr · 3082 unmodified lines
30833083 // draw a red sphere
30843084 float originSphereRadius = 0.05f;
30853085 glColor3f(1,0,0);
3086− _geometryCache.renderSphere(originSphereRadius, 15, 15);
3086+ GeometryCache::getInstance()->renderSphere(originSphereRadius, 15, 15);
30873087
30883088 // Draw voxels
30893089 if (Menu::getInstance()->isOptionChecked(MenuOption::Voxels)) {
@@ -3304,12 +3304,12 @@ void Application::renderRearViewMirror(const QRect& region, bool billboard) { · 214 unmodified lines
33043304
33053305 // set the bounds of rear mirror view
33063306 if (billboard) {
3307− QSize size = getTextureCache()->getFrameBufferSize();
3307+ QSize size = TextureCache::getInstance()->getFrameBufferSize();
33083308 glViewport(region.x(), size.height() - region.y() - region.height(), region.width(), region.height());
33093309 glScissor(region.x(), size.height() - region.y() - region.height(), region.width(), region.height());
33103310 } else {
33113311 // 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();
33133313 float ratio = QApplication::desktop()->windowHandle()->devicePixelRatio() * getRenderResolutionScale();
33143314 int x = region.x() * ratio, y = region.y() * ratio, width = region.width() * ratio, height = region.height() * ratio;
33153315 glViewport(x, size.height() - y - height, width, height);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t