Load LOD models required by phyiscal moveable objects for server only

Benau · Benau · commit b7569635a0ad · 2018-07-19T00:51:04.000+08:00
diff --git a/src/tracks/model_definition_loader.cpp b/src/tracks/model_definition_loader.cpp
@@ -59,7 +59,6 @@ void ModelDefinitionLoader::addModelDefinition(const XMLNode* xml)
 
 LODNode* ModelDefinitionLoader::instanciateAsLOD(const XMLNode* node, scene::ISceneNode* parent, std::shared_ptr<RenderInfo> ri)
 {
-#ifndef SERVER_ONLY
     scene::ISceneManager* sm = irr_driver->getSceneManager();
 
     std::string groupname = "";
@@ -74,6 +73,7 @@ LODNode* ModelDefinitionLoader::instanciateAsLOD(const XMLNode* node, scene::ISc
         lod_node->updateAbsolutePosition();
         for (unsigned int m=0; m<group.size(); m++)
         {
+#ifndef SERVER_ONLY
             if (group[m].m_skeletal_animation &&
                 (UserConfigParams::m_animated_characters ||
                 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);
             }
             else
+#endif
             {
                 scene::IMesh* a_mesh = irr_driver->getMesh(group[m].m_model_file);
                 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());
         return NULL;
     }
-#else
-    return NULL;
-#endif
 }   // instanciateAsLOD
 
 // ----------------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,6 @@ void ModelDefinitionLoader::addModelDefinition(const XMLNode* xml)`
`59`	`59`
`60`	`60`	`LODNode* ModelDefinitionLoader::instanciateAsLOD(const XMLNode* node, scene::ISceneNode* parent, std::shared_ptr<RenderInfo> ri)`
`61`	`61`	`{`
`62`		`-#ifndef SERVER_ONLY`
`63`	`62`	`scene::ISceneManager* sm = irr_driver->getSceneManager();`
`64`	`63`
`65`	`64`	`std::string groupname = "";`
`@@ -74,6 +73,7 @@ LODNode* ModelDefinitionLoader::instanciateAsLOD(const XMLNode* node, scene::ISc`
`74`	`73`	`lod_node->updateAbsolutePosition();`
`75`	`74`	`for (unsigned int m=0; m<group.size(); m++)`
`76`	`75`	`{`
	`76`	`+#ifndef SERVER_ONLY`
`77`	`77`	`if (group[m].m_skeletal_animation &&`
`78`	`78`	`(UserConfigParams::m_animated_characters \|\|`
`79`	`79`	`World::getWorld()->getIdent() == IDENT_CUTSCENE))`
`@@ -117,6 +117,7 @@ LODNode* ModelDefinitionLoader::instanciateAsLOD(const XMLNode* node, scene::ISc`
`117`	`117`	`lod_node->add(group[m].m_distance, scene_node, true);`
`118`	`118`	`}`
`119`	`119`	`else`
	`120`	`+#endif`
`120`	`121`	`{`
`121`	`122`	`scene::IMesh* a_mesh = irr_driver->getMesh(group[m].m_model_file);`
`122`	`123`	`if (!a_mesh)`
`@@ -153,9 +154,6 @@ LODNode* ModelDefinitionLoader::instanciateAsLOD(const XMLNode* node, scene::ISc`
`153`	`154`	`Log::warn("ModelDefinitionLoader", "LOD group '%s' is empty", groupname.c_str());`
`154`	`155`	`return NULL;`
`155`	`156`	`}`
`156`		`-#else`
`157`		`- return NULL;`
`158`		`-#endif`
`159`	`157`	`} // instanciateAsLOD`
`160`	`158`
`161`	`159`	`// ----------------------------------------------------------------------------`