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

Add bounding boxes visualization for SP

Browse Source
This commit is contained in:
Benau 2017-12-31 10:34:55 +08:00
parent cce8abe6f3
commit c8aea0bf9e
3 changed files with 76 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/graphics/shader_based_renderer.cpp
View File

@ -814,7 +814,10 @@ void ShaderBasedRenderer::render(float dt)
}
if (irr_driver->getBoundingBoxesViz())
{
{
glEnable(GL_DEPTH_TEST);
glDepthMask(GL_TRUE);
SP::drawBoundingBoxes();
m_draw_calls.renderBoundingBoxes();
}

71
src/graphics/sp/sp_base.cpp
View File

@ -1119,6 +1119,17 @@ inline core::vector3df getCorner(const core::aabbox3df& bbox, unsigned n)
}
} // getCorner
// ----------------------------------------------------------------------------
void addEdgeForViz(const core::vector3df& p0, const core::vector3df& p1)
{
g_bounding_boxes.push_back(p0.X);
g_bounding_boxes.push_back(p0.Y);
g_bounding_boxes.push_back(p0.Z);
g_bounding_boxes.push_back(p1.X);
g_bounding_boxes.push_back(p1.Y);
g_bounding_boxes.push_back(p1.Z);
} // addEdgeForViz
// ----------------------------------------------------------------------------
void prepareDrawCalls()
{
@ -1126,6 +1137,7 @@ void prepareDrawCalls()
{
return;
}
g_bounding_boxes.clear();
g_wind_dir = core::vector3df(1.0f, 0.0f, 0.0f) *
(irr_driver->getDevice()->getTimer()->getTime() / 1000.0f) * 1.5f;
sp_solid_poly_count = sp_shadow_poly_count = 0;
@ -1223,6 +1235,22 @@ void addObject(SPMeshNode* node)
continue;
}
if (irr_driver->getBoundingBoxesViz())
{
addEdgeForViz(getCorner(bb, 0), getCorner(bb, 1));
addEdgeForViz(getCorner(bb, 1), getCorner(bb, 5));
addEdgeForViz(getCorner(bb, 5), getCorner(bb, 4));
addEdgeForViz(getCorner(bb, 4), getCorner(bb, 0));
addEdgeForViz(getCorner(bb, 2), getCorner(bb, 3));
addEdgeForViz(getCorner(bb, 3), getCorner(bb, 7));
addEdgeForViz(getCorner(bb, 7), getCorner(bb, 6));
addEdgeForViz(getCorner(bb, 6), getCorner(bb, 2));
addEdgeForViz(getCorner(bb, 0), getCorner(bb, 2));
addEdgeForViz(getCorner(bb, 1), getCorner(bb, 3));
addEdgeForViz(getCorner(bb, 5), getCorner(bb, 7));
addEdgeForViz(getCorner(bb, 4), getCorner(bb, 6));
}
mb->uploadGLMesh();
// For first frame only need the vbo to be initialized
if (!added_for_skinning && node->getAnimationState() &&
@ -1341,9 +1369,13 @@ void addObject(SPMeshNode* node)
// ----------------------------------------------------------------------------
void handleDynamicDrawCall()
{
if (!sp_culling)
{
return;
}
for (SPDynamicDrawCall* dydc : g_dy_dc)
{
if (!dydc->isVisible())
if (!dydc->isVisible() || dydc->getVertexCount() < 3)
{
continue;
}
@ -1385,6 +1417,22 @@ void handleDynamicDrawCall()
continue;
}
if (irr_driver->getBoundingBoxesViz())
{
addEdgeForViz(getCorner(bb, 0), getCorner(bb, 1));
addEdgeForViz(getCorner(bb, 1), getCorner(bb, 5));
addEdgeForViz(getCorner(bb, 5), getCorner(bb, 4));
addEdgeForViz(getCorner(bb, 4), getCorner(bb, 0));
addEdgeForViz(getCorner(bb, 2), getCorner(bb, 3));
addEdgeForViz(getCorner(bb, 3), getCorner(bb, 7));
addEdgeForViz(getCorner(bb, 7), getCorner(bb, 6));
addEdgeForViz(getCorner(bb, 6), getCorner(bb, 2));
addEdgeForViz(getCorner(bb, 0), getCorner(bb, 2));
addEdgeForViz(getCorner(bb, 1), getCorner(bb, 3));
addEdgeForViz(getCorner(bb, 5), getCorner(bb, 7));
addEdgeForViz(getCorner(bb, 4), getCorner(bb, 6));
}
for (int dc_type = 0; dc_type < (g_handle_shadow ? 5 : 1); dc_type++)
{
if (discard[dc_type])
@ -1714,6 +1762,27 @@ void draw(RenderPass rp, DrawCallType dct)
#endif
} // draw
// ----------------------------------------------------------------------------
void drawBoundingBoxes()
{
#ifndef SERVER_ONLY
Shaders::ColoredLine *line = Shaders::ColoredLine::getInstance();
line->use();
line->bindVertexArray();
line->bindBuffer();
line->setUniforms(irr::video::SColor(255, 255, 0, 0));
const float *tmp = g_bounding_boxes.data();
for (unsigned int i = 0; i < g_bounding_boxes.size(); i += 1024 * 6)
{
unsigned count = std::min((unsigned)g_bounding_boxes.size() - i,
(unsigned)1024 * 6);
glBufferSubData(GL_ARRAY_BUFFER, 0, count * sizeof(float), &tmp[i]);
glDrawArrays(GL_LINES, 0, count / 3);
}
#endif
} // drawBoundingBoxes
// ----------------------------------------------------------------------------
void addDynamicDrawCall(SPDynamicDrawCall* dy_dc)
{

2
src/graphics/sp/sp_base.hpp
View File

@ -135,6 +135,8 @@ void uploadAll();
// ----------------------------------------------------------------------------
void resetEmptyFogColor();
// ----------------------------------------------------------------------------
void drawBoundingBoxes();
// ----------------------------------------------------------------------------
inline uint8_t srgbToLinear(float color_srgb)
{
int ret;