History

More shader fixes.

Andrzej Kapolka committed 12 years ago

Commit 34ba5cc1 parent 54315e21 file · +9 −7Browse files

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

Unified · Split

interface/src/MetavoxelSystem.cpp+9−7
@@ -880,22 +880,24 @@ void HeightfieldBuffer::render(bool cursor) { · 879 unmodified lines
880880 DefaultMetavoxelRendererImplementation::getShadowLightHeightfieldProgram().bind();
881881 DefaultMetavoxelRendererImplementation::getShadowLightHeightfieldProgram().setUniformValue(
882882 DefaultMetavoxelRendererImplementation::getShadowLightHeightScaleLocation(), 1.0f / _heightSize);
883−
883+ glDrawRangeElements(GL_TRIANGLES, 0, vertexCount - 1, indexCount, GL_UNSIGNED_INT, 0);
884+ DefaultMetavoxelRendererImplementation::getShadowMapHeightfieldProgram().bind();
885+
884886 } else if (Menu::getInstance()->isOptionChecked(MenuOption::CascadedShadows)) {
885887 DefaultMetavoxelRendererImplementation::getCascadedShadowLightHeightfieldProgram().bind();
886888 DefaultMetavoxelRendererImplementation::getCascadedShadowLightHeightfieldProgram().setUniformValue(
887889 DefaultMetavoxelRendererImplementation::getCascadedShadowLightHeightScaleLocation(), 1.0f / _heightSize);
888−
890+ glDrawRangeElements(GL_TRIANGLES, 0, vertexCount - 1, indexCount, GL_UNSIGNED_INT, 0);
891+ DefaultMetavoxelRendererImplementation::getCascadedShadowMapHeightfieldProgram().bind();
892+
889893 } else {
890894 DefaultMetavoxelRendererImplementation::getLightHeightfieldProgram().bind();
891895 DefaultMetavoxelRendererImplementation::getLightHeightfieldProgram().setUniformValue(
892− DefaultMetavoxelRendererImplementation::getBaseHeightScaleLocation(), 1.0f / _heightSize);
896+ DefaultMetavoxelRendererImplementation::getLightHeightScaleLocation(), 1.0f / _heightSize);
897+ glDrawRangeElements(GL_TRIANGLES, 0, vertexCount - 1, indexCount, GL_UNSIGNED_INT, 0);
898+ DefaultMetavoxelRendererImplementation::getHeightfieldProgram().bind();
893899 }
894900
895− glDrawRangeElements(GL_TRIANGLES, 0, vertexCount - 1, indexCount, GL_UNSIGNED_INT, 0);
896−
897− DefaultMetavoxelRendererImplementation::getHeightfieldProgram().bind();
898−
899901 glDisable(GL_POLYGON_OFFSET_FILL);
900902 glDisable(GL_BLEND);
901903 glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_CONSTANT_ALPHA, GL_ONE);