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

Fix compiler warnings

Browse Source
This commit is contained in:
Benau 2021-03-10 10:57:03 +08:00
parent 0dd3c62a43
commit d1092349f7
1 changed files with 1 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/graphics/lod_node.cpp
View File

@ -173,68 +173,6 @@ void LODNode::OnRegisterSceneNode()
const u32 now = irr_driver->getDevice()->getTimer()->getTime(); const u32 now = irr_driver->getDevice()->getTimer()->getTime();
// support an optional, mostly hard-coded fade-in/out effect for objects with a single level
if (m_nodes.size() == 1 && (m_nodes[0]->getType() == scene::ESNT_MESH ||
m_nodes[0]->getType() == scene::ESNT_ANIMATED_MESH) &&
now > m_last_tick)
{
if (m_previous_visibility == WAS_HIDDEN && shown)
{
scene::IMesh* mesh;
if (m_nodes[0]->getType() == scene::ESNT_MESH)
{
scene::IMeshSceneNode* node = (scene::IMeshSceneNode*)(m_nodes[0]);
mesh = node->getMesh();
}
else
{
assert(m_nodes[0]->getType() == scene::ESNT_ANIMATED_MESH);
scene::IAnimatedMeshSceneNode* node =
(scene::IAnimatedMeshSceneNode*)(m_nodes[0]);
assert(node != NULL);
mesh = node->getMesh();
}
}
else if (m_previous_visibility == WAS_SHOWN && !shown)
{
scene::IMesh* mesh;
if (m_nodes[0]->getType() == scene::ESNT_MESH)
{
scene::IMeshSceneNode* node = (scene::IMeshSceneNode*)(m_nodes[0]);
mesh = node->getMesh();
}
else
{
assert(m_nodes[0]->getType() == scene::ESNT_ANIMATED_MESH);
scene::IAnimatedMeshSceneNode* node =
(scene::IAnimatedMeshSceneNode*)(m_nodes[0]);
assert(node != NULL);
mesh = node->getMesh();
}
}
else if (m_previous_visibility == FIRST_PASS && !shown)
{
scene::IMesh* mesh;
if (m_nodes[0]->getType() == scene::ESNT_MESH)
{
scene::IMeshSceneNode* node = (scene::IMeshSceneNode*)(m_nodes[0]);
mesh = node->getMesh();
}
else
{
assert(m_nodes[0]->getType() == scene::ESNT_ANIMATED_MESH);
scene::IAnimatedMeshSceneNode* node =
(scene::IAnimatedMeshSceneNode*)(m_nodes[0]);
assert(node != NULL);
mesh = node->getMesh();
}
}
}
m_previous_visibility = (shown ? WAS_SHOWN : WAS_HIDDEN); m_previous_visibility = (shown ? WAS_SHOWN : WAS_HIDDEN);
m_last_tick = now; m_last_tick = now;
#ifndef SERVER_ONLY #ifndef SERVER_ONLY
@ -276,7 +214,7 @@ void LODNode::autoComputeLevel(float scale)
// Then we recompute the level of detail culling distance // Then we recompute the level of detail culling distance
int biais = m_detail.size(); int biais = m_detail.size();
for(int i = 0; i < m_detail.size(); i++) for(unsigned i = 0; i < m_detail.size(); i++)
{ {
m_detail[i] = ((step / biais) * (i + 1)); m_detail[i] = ((step / biais) * (i + 1));
biais--; biais--;