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
880 DefaultMetavoxelRendererImplementation::getShadowLightHeightfieldProgram().bind();880 DefaultMetavoxelRendererImplementation::getShadowLightHeightfieldProgram().bind();
881 DefaultMetavoxelRendererImplementation::getShadowLightHeightfieldProgram().setUniformValue(881 DefaultMetavoxelRendererImplementation::getShadowLightHeightfieldProgram().setUniformValue(
882 DefaultMetavoxelRendererImplementation::getShadowLightHeightScaleLocation(), 1.0f / _heightSize);882 DefaultMetavoxelRendererImplementation::getShadowLightHeightScaleLocation(), 1.0f / _heightSize);
883 883 glDrawRangeElements(GL_TRIANGLES, 0, vertexCount - 1, indexCount, GL_UNSIGNED_INT, 0);
884 DefaultMetavoxelRendererImplementation::getShadowMapHeightfieldProgram().bind();
885
884 } else if (Menu::getInstance()->isOptionChecked(MenuOption::CascadedShadows)) {886 } else if (Menu::getInstance()->isOptionChecked(MenuOption::CascadedShadows)) {
885 DefaultMetavoxelRendererImplementation::getCascadedShadowLightHeightfieldProgram().bind();887 DefaultMetavoxelRendererImplementation::getCascadedShadowLightHeightfieldProgram().bind();
886 DefaultMetavoxelRendererImplementation::getCascadedShadowLightHeightfieldProgram().setUniformValue(888 DefaultMetavoxelRendererImplementation::getCascadedShadowLightHeightfieldProgram().setUniformValue(
887 DefaultMetavoxelRendererImplementation::getCascadedShadowLightHeightScaleLocation(), 1.0f / _heightSize);889 DefaultMetavoxelRendererImplementation::getCascadedShadowLightHeightScaleLocation(), 1.0f / _heightSize);
888 890 glDrawRangeElements(GL_TRIANGLES, 0, vertexCount - 1, indexCount, GL_UNSIGNED_INT, 0);
891 DefaultMetavoxelRendererImplementation::getCascadedShadowMapHeightfieldProgram().bind();
892
889 } else {893 } else {
890 DefaultMetavoxelRendererImplementation::getLightHeightfieldProgram().bind();894 DefaultMetavoxelRendererImplementation::getLightHeightfieldProgram().bind();
891 DefaultMetavoxelRendererImplementation::getLightHeightfieldProgram().setUniformValue(895 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();
893 }899 }
894 900
895 glDrawRangeElements(GL_TRIANGLES, 0, vertexCount - 1, indexCount, GL_UNSIGNED_INT, 0);
896
897 DefaultMetavoxelRendererImplementation::getHeightfieldProgram().bind();
898
899 glDisable(GL_POLYGON_OFFSET_FILL);901 glDisable(GL_POLYGON_OFFSET_FILL);
900 glDisable(GL_BLEND);902 glDisable(GL_BLEND);
901 glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_CONSTANT_ALPHA, GL_ONE);903 glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_CONSTANT_ALPHA, GL_ONE);