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

Clean some code.

Browse Source
This commit is contained in:
Vincent Lejeune
2014-02-28 17:56:45 +01:00
parent baba5f79d1
commit 168780a3ac
5 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/graphics/irr_driver.cpp
View File

@@ -454,10 +454,9 @@ void IrrDriver::initDevice()
m_shadow_importance = new ShadowImportance();
m_mrt.clear();
m_mrt.reallocate(3);
m_mrt.reallocate(2);
m_mrt.push_back(m_rtts->getRTT(RTT_COLOR));
m_mrt.push_back(m_rtts->getRTT(RTT_NORMAL_AND_DEPTH));
m_mrt.push_back(m_rtts->getRTT(RTT_SPECULARMAP));
irr::video::COpenGLDriver* gl_driver = (irr::video::COpenGLDriver*)m_device->getVideoDriver();
gl_driver->extGlGenQueries(1, &m_lensflare_query);

4
src/graphics/post_processing.cpp
View File

@@ -826,9 +826,9 @@ void PostProcessing::render()
PROFILER_POP_CPU_MARKER();
}
m_material.MaterialType = irr_driver->getShader(ES_RAIN);
/* m_material.MaterialType = irr_driver->getShader(ES_RAIN);
drv->setMaterial(m_material);
static_cast<irr::video::COpenGLDriver*>(drv)->setRenderStates3DMode();
static_cast<irr::video::COpenGLDriver*>(drv)->setRenderStates3DMode();*/
if (UserConfigParams::m_mlaa) // MLAA. Must be the last pp filter.
{

3
src/graphics/render.cpp
View File

@@ -143,8 +143,6 @@ void IrrDriver::renderGLSL(float dt)
// Clear normal and depth to zero
m_video_driver->setRenderTarget(m_rtts->getRTT(RTT_NORMAL_AND_DEPTH), true, false, video::SColor(0,0,0,0));
// Clear specular map to zero
m_video_driver->setRenderTarget(m_rtts->getRTT(RTT_SPECULARMAP), true, false, video::SColor(0,0,0,0));
irr_driver->getVideoDriver()->enableMaterial2D();
RaceGUIBase *rg = world->getRaceGUI();
@@ -199,6 +197,7 @@ void IrrDriver::renderGLSL(float dt)
glDisable(GL_ALPHA_TEST);
glDepthMask(GL_TRUE);
glDisable(GL_BLEND);
glEnable(GL_CULL_FACE);
irr_driver->setPhase(SOLID_NORMAL_AND_DEPTH_PASS);
m_scene_manager->drawAll(m_renderpass);
irr_driver->setProjMatrix(irr_driver->getVideoDriver()->getTransform(video::ETS_PROJECTION));

1
src/graphics/rtts.cpp
View File

@@ -72,7 +72,6 @@ RTT::RTT()
rtts[RTT_TMP4] = drv->addRenderTargetTexture(res, "rtt.tmp4", ECF_R8, stencil);
rtts[RTT_NORMAL_AND_DEPTH] = drv->addRenderTargetTexture(res, "rtt.normal_and_depth", ECF_G16R16F, stencil);
rtts[RTT_COLOR] = drv->addRenderTargetTexture(res, "rtt.color", ECF_A16B16G16R16F, stencil);
rtts[RTT_SPECULARMAP] = drv->addRenderTargetTexture(res, "rtt.specularmap", ECF_R8, stencil);
rtts[RTT_HALF1] = drv->addRenderTargetTexture(half, "rtt.half1", ECF_A8R8G8B8, stencil);
rtts[RTT_HALF2] = drv->addRenderTargetTexture(half, "rtt.half2", ECF_A8R8G8B8, stencil);

1
src/graphics/rtts.hpp
View File

@@ -33,7 +33,6 @@ enum TypeRTT
RTT_TMP4,
RTT_NORMAL_AND_DEPTH,
RTT_COLOR,
RTT_SPECULARMAP,
RTT_HALF1,
RTT_HALF2,