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
1212 #include "InterfaceConfig.h"
1313
1414 #include <QOpenGLFramebufferObject>
15+
16+#include <PathUtils.h>
1517 #include <PerfStat.h>
1618
1719 #include "Application.h"
@@ -379,7 +381,7 @@ void ApplicationOverlay::displayOverlayTexture3DTV(Camera& whichCamera, float as · 361 unmodified lines
379381 glEnd();
380382
381383 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"));
383385 }
384386
385387 //draw the mouse pointer
@@ -513,7 +515,7 @@ void ApplicationOverlay::renderPointers() { · 127 unmodified lines
513515
514516 //lazily load crosshair texture
515517 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"));
517519 }
518520 glEnable(GL_TEXTURE_2D);
519521