Showing the changes to interface/src/Environment.cpp (1 of 29 files). Show all
Unified · Split
| @@ -17,6 +17,7 @@ · 16 unmodified lines | |||
| 17 | 17 | ||
| 18 | #include <GeometryUtil.h> | 18 | #include <GeometryUtil.h> |
| 19 | #include <PacketHeaders.h> | 19 | #include <PacketHeaders.h> |
| 20 | #include <PathUtils.h> | ||
| 20 | #include <ProgramObject.h> | 21 | #include <ProgramObject.h> |
| 21 | #include <SharedUtil.h> | 22 | #include <SharedUtil.h> |
| 22 | 23 | ||
| @@ -188,7 +189,7 @@ int Environment::parseData(const HifiSockAddr& senderAddress, const QByteArray& · 165 unmodified lines | |||
| 188 | 189 | ||
| 189 | ProgramObject* Environment::createSkyProgram(const char* from, int* locations) { | 190 | ProgramObject* Environment::createSkyProgram(const char* from, int* locations) { |
| 190 | ProgramObject* program = new ProgramObject(); | 191 | ProgramObject* program = new ProgramObject(); |
| 191 | QByteArray prefix = QString(Application::resourcesPath() + "/shaders/SkyFrom" + from).toUtf8(); | 192 | QByteArray prefix = QString(PathUtils::resourcesPath() + "/shaders/SkyFrom" + from).toUtf8(); |
| 192 | program->addShaderFromSourceFile(QGLShader::Vertex, prefix + ".vert"); | 193 | program->addShaderFromSourceFile(QGLShader::Vertex, prefix + ".vert"); |
| 193 | program->addShaderFromSourceFile(QGLShader::Fragment, prefix + ".frag"); | 194 | program->addShaderFromSourceFile(QGLShader::Fragment, prefix + ".frag"); |
| 194 | program->link(); | 195 | program->link(); |