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

Simplify mesh temporary.

Browse Source 
Until we move this code to the exporter.
This commit is contained in:
vlj 2014-05-09 15:11:18 +02:00
parent 94c65434df
commit c5e31c96b1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/graphics/irr_driver.cpp
View File

@ -841,7 +841,8 @@ scene::IMesh *IrrDriver::getMesh(const std::string &filename)
filename.c_str()); filename.c_str());
return NULL; return NULL;
} }
return am->getMesh(0); scene::IMeshManipulator *mani = irr_driver->getVideoDriver()->getMeshManipulator();
return mani->createMeshWelded(am->getMesh(0));
} // getMesh } // getMesh
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

4
src/graphics/post_processing.cpp
View File

@ -786,12 +786,12 @@ void PostProcessing::render(scene::ICameraSceneNode * const camnode)
//computeLogLuminance(in_rtt); //computeLogLuminance(in_rtt);
{ {
PROFILER_PUSH_CPU_MARKER("- Tonemap", 0xFF, 0x00, 0x00); // PROFILER_PUSH_CPU_MARKER("- Tonemap", 0xFF, 0x00, 0x00);
ScopedGPUTimer Timer(irr_driver->getGPUTimer(Q_TONEMAP)); ScopedGPUTimer Timer(irr_driver->getGPUTimer(Q_TONEMAP));
toneMap(out_fbo, in_rtt); toneMap(out_fbo, in_rtt);
std::swap(in_rtt, out_rtt); std::swap(in_rtt, out_rtt);
std::swap(in_fbo, out_fbo); std::swap(in_fbo, out_fbo);
PROFILER_POP_CPU_MARKER(); // PROFILER_POP_CPU_MARKER();
} }
{ {