History

replaced Application::resourcesPath() with PathUtils::resourcesPath()

ZappoMan committed 11 years ago

Commit bfcc78c1 parent 753dc0729 files · +194 −124Browse files

Showing the changes to interface/src/ui/ApplicationOverlay.cpp (1 of 29 files). Show all

Unified · Split

interface/src/ui/ApplicationOverlay.cpp+4−2
@@ -12,6 +12,8 @@ · 11 unmodified lines
12#include "InterfaceConfig.h"12#include "InterfaceConfig.h"
13 13
14#include <QOpenGLFramebufferObject>14#include <QOpenGLFramebufferObject>
15
16#include <PathUtils.h>
15#include <PerfStat.h>17#include <PerfStat.h>
16 18
17#include "Application.h"19#include "Application.h"
@@ -379,7 +381,7 @@ void ApplicationOverlay::displayOverlayTexture3DTV(Camera& whichCamera, float as · 361 unmodified lines
379 glEnd();381 glEnd();
380 382
381 if (_crosshairTexture == 0) {383 if (_crosshairTexture == 0) {
382 _crosshairTexture = Application::getInstance()->getGLWidget()->bindTexture(QImage(Application::resourcesPath() + "images/sixense-reticle.png"));384 _crosshairTexture = Application::getInstance()->getGLWidget()->bindTexture(QImage(PathUtils::resourcesPath() + "images/sixense-reticle.png"));
383 }385 }
384 386
385 //draw the mouse pointer387 //draw the mouse pointer
@@ -513,7 +515,7 @@ void ApplicationOverlay::renderPointers() { · 127 unmodified lines
513 515
514 //lazily load crosshair texture516 //lazily load crosshair texture
515 if (_crosshairTexture == 0) {517 if (_crosshairTexture == 0) {
516 _crosshairTexture = Application::getInstance()->getGLWidget()->bindTexture(QImage(Application::resourcesPath() + "images/sixense-reticle.png"));518 _crosshairTexture = Application::getInstance()->getGLWidget()->bindTexture(QImage(PathUtils::resourcesPath() + "images/sixense-reticle.png"));
517 }519 }
518 glEnable(GL_TEXTURE_2D);520 glEnable(GL_TEXTURE_2D);
519 521