Changeset 7287 in orxonox.OLD

Timestamp:

Apr 13, 2006, 10:41:48 PM (18 years ago)

Author:

bensch

Message:

merged back with:
svn merge . . -rHEAD:PREV

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;
-  SoundEngine::checkError("OggPlayer::release Source", __LINE__);
+  check();
   alDeleteBuffers(2, buffers);
   this->buffers[0] = 0;
   this->buffers[1] = 0;
-  SoundEngine::checkError("OggPlayer::release", __LINE__);
+  check();
 
   ov_clear(&oggStream);
@@ -184 +184 @@
 
     alSourceUnqueueBuffers(source, 1, &buffer);
-    SoundEngine::checkError("OggPlayer::update() error", __LINE__);
+    check();
 
     active = stream(buffer);
 
     alSourceQueueBuffers(source, 1, &buffer);
-    SoundEngine::checkError("OggPlayer::update()", __LINE__);
+    check();
   }
 
@@ -226 +226 @@
 
   alBufferData(buffer, format, pcm, size, vorbisInfo->rate);
-  SoundEngine::checkError("OggPlayer::stream()", __LINE__);
+  check();
 
   return true;
@@ -246 +246 @@
 
     alSourceUnqueueBuffers(source, 1, &buffer);
-    SoundEngine::checkError("OggPlayer::empty()", __LINE__);
+    check();
   }
 }
@@ -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"
@@ -26 +27 @@
 #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"
 
@@ -40 +47 @@
 #include "shell_command.h"
 
-#include "util/loading/resource_manager.h"
 #include "graphics_engine.h"
 #include "event_handler.h"
@@ -47 +53 @@
 #include "network_manager.h"
 #include "physics_engine.h"
+#include "fields.h"
 
 #include "glmenu_imagescreen.h"
@@ -96 +103 @@
   PRINTF(4)("Deleted GameWorld\n");
 
-  this->bRunning = false;
-  this->unloadData();
-
-  if( this->dataTank)
-    delete this->dataTank;
+  if (this->audioThread != NULL)
+    SDL_KillThread(this->audioThread);
 }
 
@@ -136 +140 @@
   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)
   {
-    printf("PLAYBACK\n");
-    ClassList::debug(3, CL_SOUND_OGG_PLAYER);
-    if(gw->dataTank != NULL && gw->dataTank->music != NULL)
-      gw->dataTank->music->update();
+    if(gw->dataTank->music != NULL)
+      gw->dataTank->music->playback();
     SDL_Delay(5);
   }
-  printf("END the AudioThread\n");
+  printf("End the AudioThread\n");
 }
 
@@ -169 +168 @@
   }
 
-  TiXmlDocument XMLDoc = TiXmlDocument( getLoadFile());
+  TiXmlDocument* XMLDoc = new 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());
+  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;
     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()"};
   }
@@ -189 +190 @@
   this->dataXML = (TiXmlElement*)root->Clone();
 
+  delete XMLDoc;
   this->releaseLoadScreen();
 }
@@ -199 +201 @@
 {
   delete this->shell;
-  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);
+  PRINTF(3)("GameWorld::~GameWorld() - unloading the current GameWorld\n");
 
   this->dataTank->unloadData();
@@ -215 +207 @@
   State::setCurrentStoryEntity(NULL);
   if (this->dataXML)
-  {
     delete this->dataXML;
-    this->dataXML = NULL;
-  }
 }
 
@@ -244 +233 @@
   PRINTF(3)("GameWorld::stop() - got stop signal\n");
   this->bRunning = false;
+
+//  SDL_KillThread(this->audioThread);
+  this->audioThread = NULL;
 }
 
@@ -404 +396 @@
   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 "terrain.h"
+#include "test_entity.h"
+#include "terrain.h"
 #include "skybox.h"
-#include "terrain.h"
+#include "md2Model.h"
+#include "world_entities/projectiles/projectile.h"
+#include "npcs/npc_test1.h"
 #include "playable.h"
 
@@ -119 +125 @@
  * @param root reference to the xml root element
  */
-ErrorMessage GameWorldData::loadData(const TiXmlElement* root)
+ErrorMessage GameWorldData::loadData(TiXmlElement* root)
 {
   // load the parameters
@@ -153 +159 @@
  * @param root reference to the xml root element
  */
-ErrorMessage GameWorldData::loadGUI(const TiXmlElement* root)
-{
-  const TiXmlElement* element = root->FirstChildElement("LoadScreen");
+ErrorMessage GameWorldData::loadGUI(TiXmlElement* root)
+{
+  TiXmlElement* element = root->FirstChildElement("LoadScreen");
   if( element == NULL)
   {
@@ -186 +192 @@
  * @param root reference to the xml root parameter
  */
-ErrorMessage GameWorldData::loadWorldEntities(const TiXmlElement* root)
-{
-  const TiXmlElement* element = root->FirstChildElement("WorldEntities");
+ErrorMessage GameWorldData::loadWorldEntities(TiXmlElement* root)
+{
+  TiXmlElement* element = root->FirstChildElement("WorldEntities");
 
   if( element == NULL)
@@ -204 +210 @@
       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(const TiXmlElement* root)
+ErrorMessage GameWorldData::loadScene(TiXmlElement* root)
 {
   LoadParamXML(root, "LightManager", LightManager::getInstance(), LightManager, loadParams);
@@ -342 +342 @@
   delete PhysicsEngine::getInstance();
 
-  this->setSoundTrack("");
-
+  if (this->music != NULL)
+    this->setSoundTrack("");
+  this->music = NULL;
   /* stop the sound eninge */
   SoundEngine::getInstance()->flushAllBuffers();
@@ -356 +357 @@
 {
   if (this->music != NULL)
-  {
-    OggPlayer* oldMusic = this->music;
-    this->music = NULL;
-    delete oldMusic;
-  }
-
-
-  PRINTF(0)("Setting Sound Track to %s\n", name.c_str());
+    delete this->music;
+  this->music = NULL;
 
   if (!name.empty())
@@ -369 +364 @@
     PRINTF(3)("Setting Sound Track to %s\n", name.c_str());
     std::string oggFile = ResourceManager::getFullName(name);
-    OggPlayer* newMusic = new OggPlayer(oggFile);
-    this->music = newMusic;
+    this->music = new OggPlayer(oggFile);
 
     //(OggPlayer*)ResourceManager::getInstance()->load(name, OGG, RP_LEVEL);

trunk/src/story_entities/game_world_data.h

@@ -38 +38 @@
 
     virtual ErrorMessage init();
-    virtual ErrorMessage loadData(const TiXmlElement* root);
+    virtual ErrorMessage loadData(TiXmlElement* root);
     virtual ErrorMessage unloadData();
 
@@ -46 +46 @@
 
   protected:
-    virtual ErrorMessage loadGUI(const TiXmlElement* root);
-    virtual ErrorMessage loadWorldEntities(const TiXmlElement* root);
-    virtual ErrorMessage loadScene(const TiXmlElement* root);
+    virtual ErrorMessage loadGUI(TiXmlElement* root);
+    virtual ErrorMessage loadWorldEntities(TiXmlElement* root);
+    virtual ErrorMessage loadScene(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;
 }