Changeset 7286 in orxonox.OLD for trunk

Timestamp:

Apr 13, 2006, 10:33:49 PM (19 years ago)

Author:

bensch

Message:

trunk: very stuck at the moment…. segfaults and errors everywhere…. maybe i will sync back soon… :/

Location:

trunk/src

Files:

• lib/sound/ogg_player.cc (modified) (5 diffs)
• lib/sound/ogg_player.h (modified) (1 diff)
• lib/sound/sound_source.cc (modified) (1 diff)
• story_entities/game_world.cc (modified) (13 diffs)
• story_entities/game_world_data.cc (modified) (9 diffs)
• story_entities/game_world_data.h (modified) (2 diffs)
• story_entities/multi_player_world.cc (modified) (1 diff)
• story_entities/simple_game_menu.cc (modified) (1 diff)
• story_entities/single_player_world.cc (modified) (1 diff)

trunk/src/lib/sound/ogg_player.cc

@@ -115 +115 @@
   SoundEngine::getInstance()->pushALSource(source);
   this->source = 0;
-  check();
+  SoundEngine::checkError("OggPlayer::release Source", __LINE__);
   alDeleteBuffers(2, buffers);
   this->buffers[0] = 0;
   this->buffers[1] = 0;
-  check();
+  SoundEngine::checkError("OggPlayer::release", __LINE__);
 
   ov_clear(&oggStream);
@@ -184 +184 @@
 
     alSourceUnqueueBuffers(source, 1, &buffer);
-    check();
+    SoundEngine::checkError("OggPlayer::update() error", __LINE__);
 
     active = stream(buffer);
 
     alSourceQueueBuffers(source, 1, &buffer);
-    check();
+    SoundEngine::checkError("OggPlayer::update()", __LINE__);
   }
 
@@ -226 +226 @@
 
   alBufferData(buffer, format, pcm, size, vorbisInfo->rate);
-  check();
+  SoundEngine::checkError("OggPlayer::stream()", __LINE__);
 
   return true;
@@ -246 +246 @@
 
     alSourceUnqueueBuffers(source, 1, &buffer);
-    check();
+    SoundEngine::checkError("OggPlayer::empty()", __LINE__);
   }
 }
@@ -273 +273 @@
 }
 
-/**
- * checks for errors
- */
-void OggPlayer::check()
-{
-  int error = alGetError();
-  if(error != AL_NO_ERROR)
-    PRINTF(2)("OpenAL error was raised.");
-}
 
 /**

trunk/src/lib/sound/ogg_player.h

@@ -41 +41 @@
   bool stream(ALuint buffer);
   void empty();
-  void check();
   const char* errorString(int code);
 

trunk/src/lib/sound/sound_source.cc

@@ -68 +68 @@
   if (unlikely(this->sourceID == 0))
     SoundEngine::getInstance()->popALSource(this->sourceID);
-  assert (this->sourceID != 0);
+  //assert (this->sourceID != 0);
 
   alSourceStop(this->sourceID);

trunk/src/story_entities/game_world.cc

@@ -20 +20 @@
 #include "game_world_data.h"
 
-#include "util/loading/resource_manager.h"
 #include "state.h"
 #include "class_list.h"
@@ -27 +26 @@
 #include "util/loading/game_loader.h"
 
-#include "p_node.h"
-#include "world_entity.h"
 #include "player.h"
 #include "camera.h"
 #include "environment.h"
 #include "terrain.h"
-#include "test_entity.h"
-#include "terrain.h"
 #include "md2Model.h"
-#include "world_entities/projectiles/projectile.h"
-#include "npcs/npc_test1.h"
 #include "playable.h"
 
@@ -47 +40 @@
 #include "shell_command.h"
 
+#include "util/loading/resource_manager.h"
 #include "graphics_engine.h"
 #include "event_handler.h"
@@ -53 +47 @@
 #include "network_manager.h"
 #include "physics_engine.h"
-#include "fields.h"
 
 #include "glmenu_imagescreen.h"
@@ -103 +96 @@
   PRINTF(4)("Deleted GameWorld\n");
 
-  if (this->audioThread != NULL)
-    SDL_KillThread(this->audioThread);
+  this->bRunning = false;
+  this->unloadData();
+
+  if( this->dataTank)
+    delete this->dataTank;
 }
 
@@ -140 +136 @@
   GameWorld* gw = (GameWorld*)gameWorld;
   printf("STARTIG AUDIO THREAD\n");
+  if(gw->dataTank != NULL && gw->dataTank->music != NULL)
+    gw->dataTank->music->playback();
+  SDL_Delay(100);
   while (gw->bRunning)
   {
-    if(gw->dataTank->music != NULL)
-      gw->dataTank->music->playback();
+    printf("PLAYBACK\n");
+    ClassList::debug(3, CL_SOUND_OGG_PLAYER);
+    if(gw->dataTank != NULL && gw->dataTank->music != NULL)
+      gw->dataTank->music->update();
     SDL_Delay(5);
   }
-  printf("End the AudioThread\n");
+  printf("END the AudioThread\n");
 }
 
@@ -168 +169 @@
   }
 
-  TiXmlDocument* XMLDoc = new TiXmlDocument( getLoadFile());
+  TiXmlDocument XMLDoc = TiXmlDocument( getLoadFile());
   // load the xml world file for further loading
-  if( !XMLDoc->LoadFile())
-  {
-    PRINTF(1)("loading XML File: %s @ %s:l%d:c%d\n", XMLDoc->ErrorDesc(), this->getLoadFile().c_str(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
-    delete XMLDoc;
+  if( !XMLDoc.LoadFile())
+  {
+    PRINTF(1)("loading XML File: %s @ %s:l%d:c%d\n", XMLDoc.ErrorDesc(), this->getLoadFile().c_str(), XMLDoc.ErrorRow(), XMLDoc.ErrorCol());
     return (ErrorMessage){213,"XML File parsing error","GameWorld::load()"};
   }
   // check basic validity
-  TiXmlElement* root = XMLDoc->RootElement();
+  TiXmlElement* root = XMLDoc.RootElement();
   assert( root != NULL);
   if( root == NULL || root->Value() == NULL || strcmp( root->Value(), "WorldDataFile"))
@@ -183 +183 @@
     // report an error
     PRINTF(1)("Specified XML File is not an orxonox world data file (WorldDataFile element missing)\n");
-    delete XMLDoc;
     return (ErrorMessage){213,"Path not a WorldDataFile","GameWorld::load()"};
   }
@@ -190 +189 @@
   this->dataXML = (TiXmlElement*)root->Clone();
 
-  delete XMLDoc;
   this->releaseLoadScreen();
 }
@@ -201 +199 @@
 {
   delete this->shell;
-  PRINTF(3)("GameWorld::~GameWorld() - unloading the current GameWorld\n");
+  this->shell = NULL;
+  PRINTF(0)("GameWorld::~unloadData() - unloading the current GameWorld %s::%s\n", this->getClassName(), this->getName());
+
+  if (this->audioThread != NULL)
+  {
+    this->bRunning = false;
+    SDL_WaitThread(this->audioThread, NULL);
+    this->audioThread = NULL;
+  }
+
+  ClassList::debug( 3, CL_GAME_WORLD_DATA);
 
   this->dataTank->unloadData();
@@ -207 +215 @@
   State::setCurrentStoryEntity(NULL);
   if (this->dataXML)
+  {
     delete this->dataXML;
+    this->dataXML = NULL;
+  }
 }
 
@@ -233 +244 @@
   PRINTF(3)("GameWorld::stop() - got stop signal\n");
   this->bRunning = false;
-
-//  SDL_KillThread(this->audioThread);
-  this->audioThread = NULL;
 }
 
@@ -396 +404 @@
   PNode::getNullParent()->updateNode (this->dtS);
   SoundEngine::getInstance()->update();
-
-  if (this->dataTank->music != NULL)
-    this->dataTank->music->update();
 }
 

trunk/src/story_entities/game_world_data.cc

@@ -28 +28 @@
 #include "util/loading/game_loader.h"
 
-#include "p_node.h"
 #include "world_entity.h"
 #include "player.h"
 #include "camera.h"
 #include "environment.h"
+#include "skybox.h"
 #include "terrain.h"
-#include "test_entity.h"
-#include "terrain.h"
-#include "skybox.h"
-#include "md2Model.h"
-#include "world_entities/projectiles/projectile.h"
-#include "npcs/npc_test1.h"
 #include "playable.h"
 
@@ -125 +119 @@
  * @param root reference to the xml root element
  */
-ErrorMessage GameWorldData::loadData(TiXmlElement* root)
+ErrorMessage GameWorldData::loadData(const TiXmlElement* root)
 {
   // load the parameters
@@ -159 +153 @@
  * @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)
   {
@@ -192 +186 @@
  * @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)
@@ -210 +204 @@
       if( created != NULL )
         PRINTF(4)("Created a %s: %s\n", created->getClassName(), created->getName());
+      else
+      {
+        PRINTF(2)("Unable to create a %s\n", element->Value());
+        element = element->NextSiblingElement();
+        continue;
+      }
 
       //todo do this more elegant
@@ -310 +310 @@
  * @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);
@@ -342 +342 @@
   delete PhysicsEngine::getInstance();
 
-  if (this->music != NULL)
-    this->setSoundTrack("");
-  this->music = NULL;
+  this->setSoundTrack("");
+
   /* stop the sound eninge */
   SoundEngine::getInstance()->flushAllBuffers();
@@ -357 +356 @@
 {
   if (this->music != NULL)
-    delete this->music;
-  this->music = NULL;
+  {
+    OggPlayer* oldMusic = this->music;
+    this->music = NULL;
+    delete oldMusic;
+  }
+
+
+  PRINTF(0)("Setting Sound Track to %s\n", name.c_str());
 
   if (!name.empty())
@@ -364 +369 @@
     PRINTF(3)("Setting Sound Track to %s\n", name.c_str());
     std::string oggFile = ResourceManager::getFullName(name);
-    this->music = new OggPlayer(oggFile);
+    OggPlayer* newMusic = new OggPlayer(oggFile);
+    this->music = newMusic;
 
     //(OggPlayer*)ResourceManager::getInstance()->load(name, OGG, RP_LEVEL);

trunk/src/story_entities/game_world_data.h

@@ -38 +38 @@
 
     virtual ErrorMessage init();
-    virtual ErrorMessage loadData(TiXmlElement* root);
+    virtual ErrorMessage loadData(const TiXmlElement* root);
     virtual ErrorMessage unloadData();
 
@@ -46 +46 @@
 
   protected:
-    virtual ErrorMessage loadGUI(TiXmlElement* root);
-    virtual ErrorMessage loadWorldEntities(TiXmlElement* root);
-    virtual ErrorMessage loadScene(TiXmlElement* root);
+    virtual ErrorMessage loadGUI(const TiXmlElement* root);
+    virtual ErrorMessage loadWorldEntities(const TiXmlElement* root);
+    virtual ErrorMessage loadScene(const TiXmlElement* root);
 
     virtual ErrorMessage unloadGUI();

trunk/src/story_entities/multi_player_world.cc

@@ -57 +57 @@
 {
   PRINTF(3)("MultiPlayerWorld::~MultiPlayerWorld() - deleting current world\n");
-  if( this->dataTank)
-    delete this->dataTank;
 }
 

trunk/src/story_entities/simple_game_menu.cc

@@ -79 +79 @@
 {
   PRINTF(3)("SimpleGameMenu::~SimpleGameMenu() - deleting current world\n");
-
-  if( this->dataTank)
-    delete this->dataTank;
 }
 

trunk/src/story_entities/single_player_world.cc

@@ -59 +59 @@
 {
   PRINTF(3)("SinglePlayerWorld::~SinglePlayerWorld() - deleting current world\n");
-
-  if( this->dataTank)
-    delete this->dataTank;
 }