ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed aliasing issue with render to texture

Browse Source
This commit is contained in:
Elderme
2016-01-07 15:59:06 +01:00
parent c14ce23e66
commit e58a45441b
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/graphics/post_processing.cpp
View File

@@ -730,10 +730,10 @@ public:
assignSamplerNames(0, "colorMapG", ST_NEAREST_FILTERED);
} // MLAAColorEdgeDetectionSHader
// ------------------------------------------------------------------------
void render(const core::vector2df &pixel_size)
void render(const core::vector2df &pixel_size, GLuint rtt_mlaa_colors)
{
use();
setTextureUnits(irr_driver->getRenderTargetTexture(RTT_MLAA_COLORS));
setTextureUnits(rtt_mlaa_colors);
drawFullScreenEffect(pixel_size);
} // render
}; // MLAAColorEdgeDetectionSHader
@@ -1403,7 +1403,7 @@ void PostProcessing::applyMLAA(const FrameBuffer& mlaa_tmp_framebuffer,
glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
// Pass 1: color edge detection
MLAAColorEdgeDetectionSHader::getInstance()->render(PIXEL_SIZE);
MLAAColorEdgeDetectionSHader::getInstance()->render(PIXEL_SIZE, mlaa_colors_framebuffer.getRTT()[0]);
glStencilFunc(GL_EQUAL, 1, ~0);
glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);

2
src/tracks/track.hpp
View File

@@ -428,8 +428,6 @@ public:
std::vector< std::vector<float> > buildHeightMap();
void drawMiniMap(const core::rect<s32>& dest_rect) const;
// ------------------------------------------------------------------------
const core::dimension2du& getMiniMapSize() const { return m_mini_map_size; }
// ------------------------------------------------------------------------
/** Returns true if this track has an arena mode. */
bool isArena() const { return m_is_arena; }
// ------------------------------------------------------------------------