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

Fixed coding style.

Browse Source
This commit is contained in:
hiker 2016-11-14 18:32:29 +11:00
parent feae91042a
commit 621e61c644
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/graphics/draw_tools.hpp
View File

@ -62,7 +62,7 @@ struct CustomUnrollArgs<>
static void drawMesh(const STK::Tuple<TupleTypes...> &t,
Args... args)
{
irr_driver->IncreaseObjectCount(); //TODO: move somewhere else
irr_driver->increaseObjectCount(); //TODO: move somewhere else
GLMesh *mesh = STK::tuple_get<0>(t);
//shadow_custom_unroll_args, rsm_custom_unroll_args and custom_unroll_args

20
src/graphics/irr_driver.cpp
View File

@ -158,38 +158,46 @@ void IrrDriver::reset()
m_renderer->resetPostProcessing();
} // reset
// ----------------------------------------------------------------------------
void IrrDriver::setPhase(STKRenderingPass p)
{
m_phase = p;
}
// ----------------------------------------------------------------------------
STKRenderingPass IrrDriver::getPhase() const
{
return m_phase;
}
void IrrDriver::IncreaseObjectCount()
#// ----------------------------------------------------------------------------
void IrrDriver::increaseObjectCount()
{
m_renderer->incObjectCount(m_phase);
}
} // increaseObjectCount
// ----------------------------------------------------------------------------
core::array<video::IRenderTarget> &IrrDriver::getMainSetup()
{
return m_mrt;
}
} // getMainSetup
// ----------------------------------------------------------------------------
#ifndef SERVER_ONLY
GPUTimer &IrrDriver::getGPUTimer(unsigned i)
{
return m_perf_query[i];
}
} // getGPUTimer
// ----------------------------------------------------------------------------
std::unique_ptr<RenderTarget> IrrDriver::createRenderTarget(const irr::core::dimension2du &dimension,
const std::string &name)
{
return m_renderer->createRenderTarget(dimension, name);
}
} // createRenderTarget
#endif // ~SERVER_ONLY
// ----------------------------------------------------------------------------

2
src/graphics/irr_driver.hpp
View File

@ -203,7 +203,7 @@ public:
void setPhase(STKRenderingPass);
STKRenderingPass getPhase() const;
void IncreaseObjectCount();
void increaseObjectCount();
core::array<video::IRenderTarget> &getMainSetup();
void updateConfigIfRelevant();
void setAllMaterialFlags(scene::IMesh *mesh) const;

8
src/graphics/stk_mesh_scene_node.cpp
View File

@ -345,7 +345,7 @@ void STKMeshSceneNode::render()
// Only untextured
for (unsigned i = 0; i < GLmeshes.size(); i++)
{
irr_driver->IncreaseObjectCount();
irr_driver->increaseObjectCount();
GLMesh &mesh = GLmeshes[i];
GLenum ptype = mesh.PrimitiveType;
GLenum itype = mesh.IndexType;
@ -391,7 +391,7 @@ void STKMeshSceneNode::render()
// Only untextured
for (unsigned i = 0; i < GLmeshes.size(); i++)
{
irr_driver->IncreaseObjectCount();
irr_driver->increaseObjectCount();
GLMesh &mesh = GLmeshes[i];
GLenum ptype = mesh.PrimitiveType;
GLenum itype = mesh.IndexType;
@ -494,7 +494,7 @@ void STKMeshSceneNode::render()
for (unsigned i = 0; i < GLmeshes.size(); i++)
{
GLMesh &mesh = GLmeshes[i];
irr_driver->IncreaseObjectCount();
irr_driver->increaseObjectCount();
GLenum ptype = mesh.PrimitiveType;
GLenum itype = mesh.IndexType;
size_t count = mesh.IndexCount;
@ -547,7 +547,7 @@ void STKMeshSceneNode::render()
Shaders::TransparentShader::getInstance()->use();
for (unsigned i = 0; i < GLmeshes.size(); i++)
{
irr_driver->IncreaseObjectCount();
irr_driver->increaseObjectCount();
GLMesh &mesh = GLmeshes[i];
GLenum ptype = mesh.PrimitiveType;
GLenum itype = mesh.IndexType;