Showing the changes to interface/src/MetavoxelSystem.cpp (1 of 29 files). Show all
Unified · Split
| @@ -26,6 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | |
| 27 | 27 | #include <MetavoxelMessages.h> |
| 28 | 28 | #include <MetavoxelUtil.h> |
| 29 | +#include <PathUtils.h> | |
| 29 | 30 | #include <ScriptCache.h> |
| 30 | 31 | |
| 31 | 32 | #include "Application.h" |
| @@ -63,9 +64,9 @@ void MetavoxelSystem::init() { · 31 unmodified lines | ||
| 63 | 64 | _voxelBufferAttribute->setLODThresholdMultiplier( |
| 64 | 65 | AttributeRegistry::getInstance()->getVoxelColorAttribute()->getLODThresholdMultiplier()); |
| 65 | 66 | |
| 66 | − _baseHeightfieldProgram.addShaderFromSourceFile(QGLShader::Vertex, Application::resourcesPath() + | |
| 67 | + _baseHeightfieldProgram.addShaderFromSourceFile(QGLShader::Vertex, PathUtils::resourcesPath() + | |
| 67 | 68 | "shaders/metavoxel_heightfield_base.vert"); |
| 68 | − _baseHeightfieldProgram.addShaderFromSourceFile(QGLShader::Fragment, Application::resourcesPath() + | |
| 69 | + _baseHeightfieldProgram.addShaderFromSourceFile(QGLShader::Fragment, PathUtils::resourcesPath() + | |
| 69 | 70 | "shaders/metavoxel_heightfield_base.frag"); |
| 70 | 71 | _baseHeightfieldProgram.link(); |
| 71 | 72 | |
| @@ -78,9 +79,9 @@ void MetavoxelSystem::init() { · 6 unmodified lines | ||
| 78 | 79 | |
| 79 | 80 | loadSplatProgram("heightfield", _splatHeightfieldProgram, _splatHeightfieldLocations); |
| 80 | 81 | |
| 81 | − _heightfieldCursorProgram.addShaderFromSourceFile(QGLShader::Vertex, Application::resourcesPath() + | |
| 82 | + _heightfieldCursorProgram.addShaderFromSourceFile(QGLShader::Vertex, PathUtils::resourcesPath() + | |
| 82 | 83 | "shaders/metavoxel_heightfield_cursor.vert"); |
| 83 | − _heightfieldCursorProgram.addShaderFromSourceFile(QGLShader::Fragment, Application::resourcesPath() + | |
| 84 | + _heightfieldCursorProgram.addShaderFromSourceFile(QGLShader::Fragment, PathUtils::resourcesPath() + | |
| 84 | 85 | "shaders/metavoxel_cursor.frag"); |
| 85 | 86 | _heightfieldCursorProgram.link(); |
| 86 | 87 | |
| @@ -88,17 +89,17 @@ void MetavoxelSystem::init() { · 1 unmodified line | ||
| 88 | 89 | _heightfieldCursorProgram.setUniformValue("heightMap", 0); |
| 89 | 90 | _heightfieldCursorProgram.release(); |
| 90 | 91 | |
| 91 | − _baseVoxelProgram.addShaderFromSourceFile(QGLShader::Vertex, Application::resourcesPath() + | |
| 92 | + _baseVoxelProgram.addShaderFromSourceFile(QGLShader::Vertex, PathUtils::resourcesPath() + | |
| 92 | 93 | "shaders/metavoxel_voxel_base.vert"); |
| 93 | − _baseVoxelProgram.addShaderFromSourceFile(QGLShader::Fragment, Application::resourcesPath() + | |
| 94 | + _baseVoxelProgram.addShaderFromSourceFile(QGLShader::Fragment, PathUtils::resourcesPath() + | |
| 94 | 95 | "shaders/metavoxel_voxel_base.frag"); |
| 95 | 96 | _baseVoxelProgram.link(); |
| 96 | 97 | |
| 97 | 98 | loadSplatProgram("voxel", _splatVoxelProgram, _splatVoxelLocations); |
| 98 | 99 | |
| 99 | − _voxelCursorProgram.addShaderFromSourceFile(QGLShader::Vertex, Application::resourcesPath() + | |
| 100 | + _voxelCursorProgram.addShaderFromSourceFile(QGLShader::Vertex, PathUtils::resourcesPath() + | |
| 100 | 101 | "shaders/metavoxel_voxel_cursor.vert"); |
| 101 | − _voxelCursorProgram.addShaderFromSourceFile(QGLShader::Fragment, Application::resourcesPath() + | |
| 102 | + _voxelCursorProgram.addShaderFromSourceFile(QGLShader::Fragment, PathUtils::resourcesPath() + | |
| 102 | 103 | "shaders/metavoxel_cursor.frag"); |
| 103 | 104 | _voxelCursorProgram.link(); |
| 104 | 105 | } |
| @@ -836,9 +837,9 @@ void MetavoxelSystem::guideToAugmented(MetavoxelVisitor& visitor, bool render) { · 731 unmodified lines | ||
| 836 | 837 | } |
| 837 | 838 | |
| 838 | 839 | void MetavoxelSystem::loadSplatProgram(const char* type, ProgramObject& program, SplatLocations& locations) { |
| 839 | − program.addShaderFromSourceFile(QGLShader::Vertex, Application::resourcesPath() + | |
| 840 | + program.addShaderFromSourceFile(QGLShader::Vertex, PathUtils::resourcesPath() + | |
| 840 | 841 | "shaders/metavoxel_" + type + "_splat.vert"); |
| 841 | − program.addShaderFromSourceFile(QGLShader::Fragment, Application::resourcesPath() + | |
| 842 | + program.addShaderFromSourceFile(QGLShader::Fragment, PathUtils::resourcesPath() + | |
| 842 | 843 | "shaders/metavoxel_" + type + "_splat.frag"); |
| 843 | 844 | program.link(); |
| 844 | 845 | |