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

Some fixes to the renderer.

Browse Source
This commit is contained in:
Vincent Lejeune
2014-01-18 19:47:18 +01:00
parent dec2cb29ec
commit 5f7e6b2834
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/graphics/render.cpp
View File

@@ -600,10 +600,10 @@ void IrrDriver::renderGlow(video::SOverrideMaterial &overridemat,
glowcb->setResolution(UserConfigParams::m_width,
UserConfigParams::m_height);
overridemat.Material.MaterialType = m_shaders->getShader(ES_COLORIZE);
/* overridemat.Material.MaterialType = m_shaders->getShader(ES_COLORIZE);
overridemat.EnableFlags = video::EMF_MATERIAL_TYPE;
overridemat.EnablePasses = scene::ESNRP_SOLID;
overridemat.Enabled = true;
overridemat.Enabled = true;*/
glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
glStencilFunc(GL_ALWAYS, 1, ~0);
@@ -624,7 +624,7 @@ void IrrDriver::renderGlow(video::SOverrideMaterial &overridemat,
}
// Second round for transparents; it's a no-op for solids
m_scene_manager->setCurrentRendertime(scene::ESNRP_TRANSPARENT);
/* m_scene_manager->setCurrentRendertime(scene::ESNRP_TRANSPARENT);
overridemat.Material.MaterialType = m_shaders->getShader(ES_COLORIZE_REF);
for (u32 i = 0; i < glowcount; i++)
{
@@ -640,7 +640,7 @@ void IrrDriver::renderGlow(video::SOverrideMaterial &overridemat,
cur->render();
}
overridemat.Enabled = false;
overridemat.EnablePasses = 0;
overridemat.EnablePasses = 0;*/
glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
glDisable(GL_STENCIL_TEST);
@@ -668,7 +668,7 @@ void IrrDriver::renderGlow(video::SOverrideMaterial &overridemat,
glEnable(GL_BLEND);
glBlendEquation(GL_FUNC_ADD);
glBlendFunc(GL_SRC_ALPHA, EBF_ONE_MINUS_SRC_ALPHA);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glStencilFunc(GL_EQUAL, 0, ~0);
glEnable(GL_STENCIL_TEST);
m_video_driver->setRenderTarget(m_rtts->getRTT(RTT_COLOR), false, false);

2
src/graphics/stkmesh.cpp
View File

@@ -26,7 +26,7 @@ GLuint createVAO(GLuint vbo, GLuint idx, GLuint attrib_position, GLuint attrib_t
glVertexAttribPointer(attrib_position, 3, GL_FLOAT, GL_FALSE, stride, 0);
if ((GLint)attrib_texcoord != -1)
glVertexAttribPointer(attrib_texcoord, 2, GL_FLOAT, GL_FALSE, stride, (GLvoid*) 28);
if ((GLint)attrib_second_texcoord != 1)
if ((GLint)attrib_second_texcoord != -1)
{
if (stride < 44)
Log::error("material", "Second texcoords not present in VBO");