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

Load LOD models required by phyiscal moveable objects for server only

Browse Source
This commit is contained in:
Benau 2018-07-19 00:51:04 +08:00
parent 5e7ec89002
commit b7569635a0
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tracks/model_definition_loader.cpp
View File

@ -59,7 +59,6 @@ void ModelDefinitionLoader::addModelDefinition(const XMLNode* xml)
LODNode* ModelDefinitionLoader::instanciateAsLOD(const XMLNode* node, scene::ISceneNode* parent, std::shared_ptr<RenderInfo> ri) LODNode* ModelDefinitionLoader::instanciateAsLOD(const XMLNode* node, scene::ISceneNode* parent, std::shared_ptr<RenderInfo> ri)
{ {
#ifndef SERVER_ONLY
scene::ISceneManager* sm = irr_driver->getSceneManager(); scene::ISceneManager* sm = irr_driver->getSceneManager();
std::string groupname = ""; std::string groupname = "";
@ -74,6 +73,7 @@ LODNode* ModelDefinitionLoader::instanciateAsLOD(const XMLNode* node, scene::ISc
lod_node->updateAbsolutePosition(); lod_node->updateAbsolutePosition();
for (unsigned int m=0; m<group.size(); m++) for (unsigned int m=0; m<group.size(); m++)
{ {
#ifndef SERVER_ONLY
if (group[m].m_skeletal_animation && if (group[m].m_skeletal_animation &&
(UserConfigParams::m_animated_characters || (UserConfigParams::m_animated_characters ||
World::getWorld()->getIdent() == IDENT_CUTSCENE)) World::getWorld()->getIdent() == IDENT_CUTSCENE))
@ -117,6 +117,7 @@ LODNode* ModelDefinitionLoader::instanciateAsLOD(const XMLNode* node, scene::ISc
lod_node->add(group[m].m_distance, scene_node, true); lod_node->add(group[m].m_distance, scene_node, true);
} }
else else
#endif
{ {
scene::IMesh* a_mesh = irr_driver->getMesh(group[m].m_model_file); scene::IMesh* a_mesh = irr_driver->getMesh(group[m].m_model_file);
if (!a_mesh) if (!a_mesh)
@ -153,9 +154,6 @@ LODNode* ModelDefinitionLoader::instanciateAsLOD(const XMLNode* node, scene::ISc
Log::warn("ModelDefinitionLoader", "LOD group '%s' is empty", groupname.c_str()); Log::warn("ModelDefinitionLoader", "LOD group '%s' is empty", groupname.c_str());
return NULL; return NULL;
} }
#else
return NULL;
#endif
} // instanciateAsLOD } // instanciateAsLOD
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------