History

Quick fix for base colors underneath terrain.

Andrzej Kapolka committed 12 years ago

Commit bf5e5fd1 parent da96a4a1 file · +2 −2Browse files

Showing the changes to interface/src/MetavoxelSystem.cpp (1 of 1 file). Show all

Unified · Split

interface/src/MetavoxelSystem.cpp+2−2
@@ -1050,8 +1050,8 @@ void DefaultMetavoxelRendererImplementation::init() { · 1049 unmodified lines
10501050 _baseHeightfieldProgram.bind();
10511051 _baseHeightfieldProgram.setUniformValue("heightMap", 0);
10521052 _baseHeightfieldProgram.setUniformValue("diffuseMap", 1);
1053− _baseHeightScaleLocation = _heightfieldProgram.uniformLocation("heightScale");
1054− _baseColorScaleLocation = _heightfieldProgram.uniformLocation("colorScale");
1053+ _baseHeightScaleLocation = _baseHeightfieldProgram.uniformLocation("heightScale");
1054+ _baseColorScaleLocation = _baseHeightfieldProgram.uniformLocation("colorScale");
10551055 _baseHeightfieldProgram.release();
10561056
10571057 _splatHeightfieldProgram.addShaderFromSourceFile(QGLShader::Vertex, Application::resourcesPath() +