Changeset 458 for code/branches

Timestamp:

Dec 11, 2007, 11:29:16 PM (17 years ago)

Author:

nicolasc

Message:

• removed setupCEGUI as it is not used nor does it work
• some minor changes in audio

Location:

code/branches/FICN/src

Files:

• audio/AudioManager.cc (modified) (4 diffs)
• audio/CMakeLists.txt (modified) (3 diffs)
• orxonox/orxonox.cc (modified) (6 diffs)

code/branches/FICN/src/audio/AudioManager.cc

@@ -7 +7 @@
         AudioManager::AudioManager()
         {
-                ambientPath = "audio/ambient";
+    ambientPath = "audio/ambient";
 
-                alutInit(NULL, 0);
-                
-            
-
+    alutInit(NULL, 0);
 
 
         }
-                
+
         AudioManager::~AudioManager()
         {
                 for (unsigned int i=0;i<=bgSounds.size();i++)
                 {
-                        bgSounds[i].release();  
+                        bgSounds[i].release();
                 }
                 alutExit();
@@ -46 +43 @@
         {
                 std::cout << "Stopped playing background sound"<<std::endl;
-        }       
+        }
 
         void AudioManager::ambientAdd(std::string file)
         {
-    std::string path = ambientPath + "/" + file + ".ogg"; 
+    std::string path = ambientPath + "/" + file + ".ogg";
                 AudioStream tmp(path);
                 tmp.open();
                 if (tmp.isLoaded())
                 {
-                        bgSounds.push_back(tmp);        
+                        bgSounds.push_back(tmp);
                         std::cout << "Added background sound "<<file<<std::endl;
                 }
         }
-        
+
         void AudioManager::update()
         {
@@ -77 +74 @@
                                 if (!playing)
                                 {
-                                        if (currentBgSound < bgSounds.size()-1)
-                                        {
-                                                currentBgSound++;
-                                        }
-                                        else
-                                        {
-                                                currentBgSound=0;
-                                        }
+//                                      if (currentBgSound < bgSounds.size()-1)
+//                                      {
+//                                              currentBgSound++;
+//                                      }
+//                                      else
+//                                      {
+//                                              currentBgSound=0;
+//                                      }
+          // switch to next sound in list/array
+          currentBgSound = ++currentBgSound % bgSounds.size();
+
                                         if (!bgSounds[currentBgSound].isLoaded())
                                         {
@@ -96 +96 @@
                 }
         }
-        
+
         void AudioManager::setPos(std::vector<float> newPosition)
         {
-                
+
         }
 
         void AudioManager::setSpeed(std::vector<float> newSpeed)
         {
-                
+
         }
 
         void AudioManager::setOri(std::vector<float> at, std::vector<float> up)
         {
-                
+
         }
 }

code/branches/FICN/src/audio/CMakeLists.txt

@@ -1 +1 @@
 PROJECT(Orxonox)
 
-SET(SRC_FILES 
+SET(SRC_FILES
         AudioIncludes.h
         AudioManager.cc
@@ -8 +8 @@
         AudioStream.cc
 )
-SET(INC_FILES 
+SET(INC_FILES
         AudioManager.h
         AudioBuffer.h
@@ -15 +15 @@
 )
 
+INCLUDE_DIRECTORIES(..)
 
 ADD_LIBRARY(audio ${SRC_FILES} ${INC_FILES})

code/branches/FICN/src/orxonox/orxonox.cc

@@ -114 +114 @@
     bool frameStarted(const FrameEvent& evt)
     {
-    
+
         auMan->update();
-    
+
       mKeyboard->capture();
       mMouse->capture();
@@ -202 +202 @@
         setupScene();
         setupInputSystem();
-        setupCEGUI();
+//         setupCEGUI();
         createFrameListener();
         startRenderLoop();
@@ -215 +215 @@
 //        delete mSystem;
 
-        delete mListener;
-        delete mRoot;
+//         delete mListener;
+//         delete mRoot;
       }
 
@@ -294 +294 @@
 
       string levelFile = "sp_level_moonstation.oxw";
-      loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
+//       loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
     }
 
@@ -359 +359 @@
       }
 
-      void setupCEGUI()
-      {
-        Ogre::SceneManager *mgr = mRoot->getSceneManager("Default SceneManager");
-        Ogre::RenderWindow *win = mRoot->getAutoCreatedWindow();
+//       void setupCEGUI()
+//       {
+//         Ogre::SceneManager *mgr = mRoot->getSceneManager("Default SceneManager");
+//         Ogre::RenderWindow *win = mRoot->getAutoCreatedWindow();
 
         // CEGUI setup
@@ -369 +369 @@
 
         // Other CEGUI setup here.
-      }
+//       }