Changeset 8284 for code/branches/kicklib2/src/orxonox

Timestamp:

Apr 21, 2011, 6:58:23 PM (14 years ago)

Author:

rgrieder

Message:

Merged revisions 7978 - 8096 from kicklib to kicklib2.

Location:

code/branches/kicklib2

Files:

• . (modified) (1 prop)
• src/orxonox/MoodManager.cc (modified) (1 diff)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/sound/AmbientSound.cc (modified) (1 diff)
• src/orxonox/sound/SoundBuffer.cc (modified) (1 diff)
• src/orxonox/sound/SoundManager.cc (modified) (3 diffs)
• src/orxonox/sound/WorldSound.cc (modified) (1 diff)

code/branches/kicklib2/src/orxonox/MoodManager.cc

@@ -56 +56 @@
             COUT(2) << "Mood Warning: Folder for default mood (" << MoodManager::defaultMood_ << ") does not exist!" << std::endl;
         }
+        
+        // @TODO
+        // Creating a vector of the available moods to enable easy mood selection by Lua/CEGUI        
     }
 

code/branches/kicklib2/src/orxonox/OrxonoxPrereqs.h

@@ -53 +53 @@
 #    endif
 #  endif
-#elif defined ( ORXONOX_GCC_VISIBILITY )
+#  define _OrxonoxPrivate
+#elif defined (ORXONOX_GCC_VISIBILITY)
 #  define _OrxonoxExport  __attribute__ ((visibility("default")))
+#  define _OrxonoxPrivate __attribute__ ((visibility("hidden")))
 #else
 #  define _OrxonoxExport
+#  define _OrxonoxPrivate
 #endif
 

code/branches/kicklib2/src/orxonox/sound/AmbientSound.cc

@@ -42 +42 @@
 
         // Ambient sounds always fade in
-        this->setVolume(0);
+        this->setVolume(0.0f);
     }
 

code/branches/kicklib2/src/orxonox/sound/SoundBuffer.cc

@@ -30 +30 @@
 #include "SoundBuffer.h"
 
-#include <AL/alut.h>
+#include <alut.h>
 #include <vorbis/vorbisfile.h>
 

code/branches/kicklib2/src/orxonox/sound/SoundManager.cc

@@ -31 +31 @@
 #include "SoundManager.h"
 
-#include <AL/alut.h>
 #include <utility>
+#include <alut.h>
 #include <loki/ScopeGuard.h>
 
@@ -73 +73 @@
         this->bDestructorCalled_ = false;
 
+        // Clear error messages (might be problematic on some systems)
+        alGetError();
+        alutGetError();
+
         // See whether we even want to load
         bool bDisableSound_ = false;
@@ -78 +82 @@
         if (bDisableSound_)
             ThrowException(InitialisationAborted, "Sound: Not loading at all");
-
         if (!alutInitWithoutContext(NULL, NULL))
             ThrowException(InitialisationFailed, "Sound Error: ALUT initialisation failed: " << alutGetErrorString(alutGetError()));

code/branches/kicklib2/src/orxonox/sound/WorldSound.cc

@@ -30 +30 @@
 #include "WorldSound.h"
 
-#include <AL/alut.h>
+#include <alut.h>
+
 #include "util/Math.h"
 #include "core/CoreIncludes.h"