Changeset 7370 in orxonox.OLD for trunk/src/story_entities/game_world_data.cc

Timestamp:

Apr 26, 2006, 1:31:01 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: drawLists/tickLists are used, and made some TiXmlElement to const TiXmlElement, also fixed some bugs in the loadWorldEntities-functions from Gameworld and SipleGameMenu

File:

• trunk/src/story_entities/game_world_data.cc (modified) (9 diffs)

trunk/src/story_entities/game_world_data.cc

@@ -114 +114 @@
  * @param root reference to the xml root element
  */
-ErrorMessage GameWorldData::loadData(TiXmlElement* root)
+ErrorMessage GameWorldData::loadData(const TiXmlElement* root)
 {
   // load the parameters
@@ -145 +145 @@
 
 /**
- *  loads the GUI data
+ * @brief loads the GUI data
  * @param root reference to the xml root element
  */
-ErrorMessage GameWorldData::loadGUI(TiXmlElement* root)
-{
-  TiXmlElement* element = root->FirstChildElement("LoadScreen");
+ErrorMessage GameWorldData::loadGUI(const TiXmlElement* root)
+{
+  const TiXmlElement* element = root->FirstChildElement("LoadScreen");
   if( element == NULL)
   {
@@ -169 +169 @@
 
 /**
- *  unloads the GUI data
+ * @brief unloads the GUI data
  */
 ErrorMessage GameWorldData::unloadGUI()
@@ -178 +178 @@
 
 /**
- *  loads the world entities from the xml file
+ * @brief loads the world entities from the xml file
  * @param root reference to the xml root parameter
  */
-ErrorMessage GameWorldData::loadWorldEntities(TiXmlElement* root)
-{
-  TiXmlElement* element = root->FirstChildElement("WorldEntities");
+ErrorMessage GameWorldData::loadWorldEntities(const TiXmlElement* root)
+{
+  const TiXmlElement* element = root->FirstChildElement("WorldEntities");
 
   if( element == NULL)
@@ -201 +201 @@
 
       //todo do this more elegant
-      if( element->Value() != NULL && !strcmp( element->Value(), "SkyBox"))
+      if( element->Value() == "SkyBox" && created->isA(CL_SKYBOX))
       {
         this->sky = dynamic_cast<WorldEntity*>(created);
         State::setSkyBox(dynamic_cast<SkyBox*>(this->sky));
       }
-      if( element->Value() != NULL && !strcmp( element->Value(), "Terrain"))
+      if( element->Value() == "Terrain" && created->isA(CL_TERRAIN))
       {
         this->terrain = dynamic_cast<Terrain*>(created);
@@ -223 +223 @@
   Playable* playable;
   const list<BaseObject*>* playableList = ClassList::getList(CL_PLAYABLE);
-  if (playableList != NULL)
-  {
+  if (playableList != NULL && !playableList->empty())
+  {
+    /// TODO Make this also loadable
     playable = dynamic_cast<Playable*>(playableList->front());
     this->localPlayer->setPlayable(playable);
   }
+
+  // Fill the EntityLists. Tick then Draw:
+  this->tickLists.push_back(OM_DEAD_TICK);
+  this->tickLists.push_back(OM_ENVIRON);
+  this->tickLists.push_back(OM_COMMON);
+  this->tickLists.push_back(OM_GROUP_00);
+  this->tickLists.push_back(OM_GROUP_00_PROJ);
+  this->tickLists.push_back(OM_GROUP_01);
+  this->tickLists.push_back(OM_GROUP_01_PROJ);
+
+  this->drawLists.push_back(OM_ENVIRON_NOTICK);
+  this->drawLists.push_back(OM_ENVIRON);
+  this->drawLists.push_back(OM_COMMON);
+  this->drawLists.push_back(OM_GROUP_00);
+  this->drawLists.push_back(OM_GROUP_00_PROJ);
+  this->drawLists.push_back(OM_GROUP_01);
+  this->drawLists.push_back(OM_GROUP_01_PROJ);
 
   /* init the pnode tree */
@@ -248 +266 @@
   if (nodeList != NULL)
     while (!nodeList->empty())
-  {
-//    ClassList::debug( 3, CL_PARENT_NODE);
-//    PNode::getNullParent()->debugNode(0);
-//    printf("%s::%s\n", nodeList->front()->getClassName(), nodeList->front()->getName());
-    delete nodeList->front();
-  }
+    {
+      //    ClassList::debug( 3, CL_PARENT_NODE);
+      //    PNode::getNullParent()->debugNode(0);
+      //    printf("%s::%s\n", nodeList->front()->getClassName(), nodeList->front()->getName());
+      delete nodeList->front();
+    }
   /* remove the player object */
   if( this->localPlayer)
@@ -271 +289 @@
 
   nodeList = ClassList::getList(CL_ELEMENT_2D);
-    if (nodeList != NULL)
-       while (!nodeList->empty())
-         delete nodeList->front();
-
-
-
-
-  // unload the resources !!
+  if (nodeList != NULL)
+    while (!nodeList->empty())
+      delete nodeList->front();
+
+  // At this Point all the WorldEntites should be unloaded.
+  this->tickLists.clear();
+  this->drawLists.clear();
+
+  // unload the resources loaded in this Level !!
   ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);
 
@@ -296 +315 @@
 
 /**
- *  loads the scene data
+ * @brief loads the scene data
  * @param root reference to the xml root element
  */
-ErrorMessage GameWorldData::loadScene(TiXmlElement* root)
+ErrorMessage GameWorldData::loadScene(const TiXmlElement* root)
 {
   LoadParamXML(root, "LightManager", LightManager::getInstance(), LightManager, loadParams);