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

Timestamp:

Oct 3, 2006, 12:19:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

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

trunk/src/story_entities/game_world_data.cc

@@ -21 +21 @@
 #include "game_world_data.h"
 
+#include "state.h"
+#include "substring.h"
+
+#include "util/loading/game_loader.h"
 #include "util/loading/resource_manager.h"
-#include "state.h"
-#include "class_list.h"
-#include "substring.h"
-
-#include "util/loading/game_loader.h"
 
 #include "world_entity.h"
@@ -41 +40 @@
 
 #include "util/loading/factory.h"
-#include "fast_factory.h"
-#include "util/loading/load_param.h"
+#include "loading/fast_factory.h"
+#include "util/loading/load_param_xml.h"
 
 #include "graphics_engine.h"
-#include "effects/atmospheric_engine.h"
+#include "graphics_effect.h"
+#include "weather_effects/atmospheric_engine.h"
 #include "event_handler.h"
 #include "sound_engine.h"
@@ -51 +51 @@
 #include "network_manager.h"
 #include "physics_engine.h"
-#include "fields.h"
 
 #include "glmenu_imagescreen.h"
@@ -61 +60 @@
 
 
-
-
-
+ObjectListDefinition(GameWorldData);
 /**
  * constructor of the GameWorldData
@@ -69 +66 @@
 GameWorldData::GameWorldData()
 {
-  this->setClassID(CL_GAME_WORLD_DATA, "GameWorldData");
+  this->registerObject(this, GameWorldData::_objectList);
 
   this->glmis = NULL;
@@ -119 +116 @@
 ErrorMessage GameWorldData::loadData(const TiXmlElement* root)
 {
+  assert (root != NULL);
   // load the parameters
   // name
-  std::string string = grabParameter( root, "name");
+  std::string string = LoadParamBase::grabParameter( root, "name");
   if( string.empty() )
   {
@@ -194 +192 @@
 ErrorMessage GameWorldData::loadWorldEntities(const TiXmlElement* root)
 {
-
   const TiXmlElement* element = root->FirstChildElement("WorldEntities");
   bool mouseCaptured = EventHandler::getInstance()->grabbedEvents();
@@ -215 +212 @@
 
       //todo do this more elegant
-      if( element->Value() == "SkyBox" && created->isA(CL_SKYBOX))
+      if( element->Value() == "SkyBox" && created->isA(SkyBox::staticClassID()))
       {
         this->sky = dynamic_cast<WorldEntity*>(created);
         State::setSkyBox(dynamic_cast<SkyBox*>(this->sky));
       }
-      if( element->Value() == "Terrain" && created->isA(CL_TERRAIN))
+      if( element->Value() == "Terrain" && created->isA(Terrain::staticClassID()))
       {
         this->terrain = dynamic_cast<Terrain*>(created);
@@ -236 +233 @@
 
   Playable* playable;
-  const std::list<BaseObject*>* playableList = ClassList::getList(CL_PLAYABLE);
-  if (playableList != NULL && !playableList->empty())
+  if (!Playable::objectList().empty())
   {
     /// TODO Make this also loadable
-    playable = dynamic_cast<Playable*>(playableList->front());
-    this->localPlayer->setPlayable(playable);
+    this->localPlayer->setPlayable(Playable::objectList().front());
   }
 
@@ -280 +275 @@
   GraphicsEngine::getInstance()->displayFPS(false);
   // erease everything that is left.
-  // delete PNode::getNullParent(); // not needed as this is also done in the next step (and also much cleaner)
-  const std::list<BaseObject*>* nodeList;
   //secondary cleanup of PNodes;
-  nodeList = ClassList::getList(CL_PARENT_NODE);
-  if (nodeList != NULL)
-    while (!nodeList->empty())
-    {
-      //    ClassList::debug( 3, CL_PARENT_NODE);
-      //    PNode::getNullParent()->debugNode(0);
-      //    printf("%s::%s\n", nodeList->front()->getClassCName(), nodeList->front()->getName());
-      delete nodeList->front();
-    }
+  while (!PNode::objectList().empty())
+    delete PNode::objectList().front();
+
   /* remove the player object */
   if( this->localPlayer)
@@ -302 +289 @@
   this->terrain = NULL;
 
-  nodeList = ClassList::getList(CL_GRAPHICS_EFFECT);
-  if (nodeList != NULL)
-    while (!nodeList->empty())
-      delete nodeList->front();
-
-
-  nodeList = ClassList::getList(CL_ELEMENT_2D);
-  if (nodeList != NULL)
-    while (!nodeList->empty())
-      delete nodeList->front();
+  while (!GraphicsEffect::objectList().empty())
+    delete GraphicsEffect::objectList().front();
+
+
+  while (!Element2D::objectList().empty())
+    delete Element2D::objectList().front();
 
   // At this Point all the WorldEntites should be unloaded.
@@ -318 +301 @@
 
   // unload the resources loaded in this Level !!
-  ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);
+  /// FIXME TODO HACK!!
+//  ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);
 
   if (State::getObjectManager() == this->objectManager)
@@ -395 +379 @@
   {
     PRINTF(3)("Setting Sound Track to %s\n", name.c_str());
-    std::string oggFile = ResourceManager::getFullName(name);
+    std::string oggFile = Resources::ResourceManager::getInstance()->prependAbsoluteMainPath(name);
     this->music = new OrxSound::OggPlayer(oggFile);
     if (this->localPlayer != NULL)
@@ -414 +398 @@
     PRINTF(2)("creating %s\n", element->Value());
     BaseObject* created = Factory::fabricate(element);
-    if (created != NULL && created->isA(CL_GAME_RULES))
+    if (created != NULL && created->isA(GameRules::staticClassID()))
     {
       this->gameRule = dynamic_cast<GameRules*>(created);