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

Don't add instance data if missing shadow shader

Browse Source
This commit is contained in:
Benau
2018-01-23 14:27:15 +08:00
parent 40552b3fa0
commit 9ecf952057
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -793,8 +793,10 @@ void addObject(SPMeshNode* node)
core::aabbox3df bb = mb->getBoundingBox();
model_matrix.transformBoxEx(bb);
std::vector<bool> discard;
discard.resize((g_handle_shadow ? 5 : 1), false);
for (int dc_type = 0; dc_type < (g_handle_shadow ? 5 : 1); dc_type++)
const bool handle_shadow =
g_handle_shadow && shader->hasShader(RP_SHADOW);
discard.resize((handle_shadow ? 5 : 1), false);
for (int dc_type = 0; dc_type < (handle_shadow ? 5 : 1); dc_type++)
{
for (int i = 0; i < 24; i += 4)
{
@@ -819,7 +821,7 @@ void addObject(SPMeshNode* node)
}
}
}
if (g_handle_shadow ?
if (handle_shadow ?
(discard[0] && discard[1] && discard[2] && discard[3] &&
discard[4]) : discard[0])
{
@@ -867,7 +869,7 @@ void addObject(SPMeshNode* node)
node->getTextureMatrix(m)[1], hue,
(short)node->getSkinningOffset());
for (int dc_type = 0; dc_type < (g_handle_shadow ? 5 : 1); dc_type++)
for (int dc_type = 0; dc_type < (handle_shadow ? 5 : 1); dc_type++)
{
if (discard[dc_type])
{
@@ -959,8 +961,10 @@ void handleDynamicDrawCall()
core::aabbox3df bb = dydc->getBoundingBox();
dydc->getAbsoluteTransformation().transformBoxEx(bb);
std::vector<bool> discard;
discard.resize((g_handle_shadow ? 5 : 1), false);
for (int dc_type = 0; dc_type < (g_handle_shadow ? 5 : 1); dc_type++)
const bool handle_shadow =
g_handle_shadow && shader->hasShader(RP_SHADOW);
discard.resize((handle_shadow ? 5 : 1), false);
for (int dc_type = 0; dc_type < (handle_shadow ? 5 : 1); dc_type++)
{
for (int i = 0; i < 24; i += 4)
{
@@ -985,7 +989,7 @@ void handleDynamicDrawCall()
}
}
}
if (g_handle_shadow ?
if (handle_shadow ?
(discard[0] && discard[1] && discard[2] && discard[3] &&
discard[4]) : discard[0])
{
@@ -1008,7 +1012,7 @@ void handleDynamicDrawCall()
addEdgeForViz(getCorner(bb, 4), getCorner(bb, 6));
}
for (int dc_type = 0; dc_type < (g_handle_shadow ? 5 : 1); dc_type++)
for (int dc_type = 0; dc_type < (handle_shadow ? 5 : 1); dc_type++)
{
if (discard[dc_type])
{