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

Removed m_diffuse_coefficients_calculated attribute in RTT (diffuse coefficients are now managed in SphericalHarmonic class)

Browse Source
This commit is contained in:
Elderme
2015-07-30 17:51:42 +02:00
parent 133f8d5966
commit 8642e14bc3
2 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/graphics/rtts.cpp
View File

@@ -56,7 +56,6 @@ RTT::RTT(size_t width, size_t height)
m_RH_FBO = NULL;
m_RSM = NULL;
m_RH_FBO = NULL;
m_diffuse_coefficients_calculated = false;
using namespace video;
using namespace core;
@@ -296,23 +295,6 @@ void RTT::prepareRender(scene::ICameraSceneNode* camera)
irr_driver->setRTT(this);
irr_driver->getSceneManager()->setActiveCamera(camera);
//m_diffuse_coefficients_calculated = true;
if (!m_diffuse_coefficients_calculated)
{
m_diffuse_coefficients_calculated = true;
Log::debug("RTT", "hophophop");
}
//TODO!
/*if (!m_diffuse_coefficients_calculated)
{
//irr_driver->generateDiffuseCoefficients();
if(irr_driver->getSkybox() != NULL) {
irr_driver->getSkybox()->generateDiffuseCoefficients(irr_driver->getVideoDriver(), irr_driver->getSceneManager()->getAmbientLight().toSColor());
m_diffuse_coefficients_calculated = true;
}
}*/
}
FrameBuffer* RTT::render(scene::ICameraSceneNode* camera, float dt)
@@ -322,11 +304,6 @@ FrameBuffer* RTT::render(scene::ICameraSceneNode* camera, float dt)
irr_driver->getSceneManager()->setActiveCamera(camera);
std::vector<IrrDriver::GlowData> glows;
// TODO: put this outside of the rendering loop
//irr_driver->generateDiffuseCoefficients();
//if(irr_driver->getSkybox() != NULL)
// irr_driver->getSkybox()->generateDiffuseCoefficients(irr_driver->getVideoDriver(), irr_driver->getSceneManager()->getAmbientLight().toSColor());
irr_driver->computeMatrixesAndCameras(camera, m_width, m_height);
unsigned plc = irr_driver->updateLightsInfo(camera, dt);
irr_driver->uploadLightingData();

2
src/graphics/rtts.hpp
View File

@@ -62,8 +62,6 @@ private:
int m_width;
int m_height;
bool m_diffuse_coefficients_calculated;
unsigned shadowColorTex, shadowDepthTex;
unsigned RSM_Color, RSM_Normal, RSM_Depth;
unsigned RH_Red, RH_Green, RH_Blue;