[Orxonox-commit 3355] r8043 - in code/branches/mac_osx/src: external/bullet/BulletCollision/NarrowPhaseCollision libraries/core orxonox orxonox/sound

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-03-08 06:26:51 +0100 (Tue, 08 Mar 2011)
New Revision: 8043

Modified:
   code/branches/mac_osx/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
   code/branches/mac_osx/src/libraries/core/DynLib.h
   code/branches/mac_osx/src/libraries/core/GUIManager.cc
   code/branches/mac_osx/src/libraries/core/GraphicsManager.cc
   code/branches/mac_osx/src/libraries/core/PathConfig.cc
   code/branches/mac_osx/src/orxonox/MoodManager.cc
   code/branches/mac_osx/src/orxonox/sound/SoundManager.cc
Log:
Removed unnecessary changes in mac_osx branch.

Modified: code/branches/mac_osx/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
===================================================================
--- code/branches/mac_osx/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp	2011-03-07 18:15:02 UTC (rev 8042)
+++ code/branches/mac_osx/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp	2011-03-08 05:26:51 UTC (rev 8043)
@@ -37,12 +37,6 @@
 int gNumDeepPenetrationChecks = 0;
 int gNumGjkChecks = 0;
 
-#ifdef check
-struct CompilerError
-{
-    void CompilerError() {}
-};
-#endif
 
 
 btGjkPairDetector::btGjkPairDetector(const btConvexShape* objectA,const btConvexShape* objectB,btSimplexSolverInterface* simplexSolver,btConvexPenetrationDepthSolver*	penetrationDepthSolver)

Modified: code/branches/mac_osx/src/libraries/core/DynLib.h
===================================================================
--- code/branches/mac_osx/src/libraries/core/DynLib.h	2011-03-07 18:15:02 UTC (rev 8042)
+++ code/branches/mac_osx/src/libraries/core/DynLib.h	2011-03-08 05:26:51 UTC (rev 8043)
@@ -109,6 +109,7 @@
         void* getSymbol( const std::string& strName ) const throw();
 
     protected:
+
         /// Handle to the loaded library.
         DYNLIB_HANDLE m_hInst;
     };

Modified: code/branches/mac_osx/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/mac_osx/src/libraries/core/GUIManager.cc	2011-03-07 18:15:02 UTC (rev 8042)
+++ code/branches/mac_osx/src/libraries/core/GUIManager.cc	2011-03-08 05:26:51 UTC (rev 8043)
@@ -350,7 +350,6 @@
     */
     void GUIManager::buttonPressed(MouseButtonCode::ByEnum id)
     {
-        //guiSystem_->injectMouseButtonDown(convertButton(id));
         this->protectedCall(boost::bind(&CEGUI::System::injectMouseButtonDown, _1, convertButton(id)));
     }
 

Modified: code/branches/mac_osx/src/libraries/core/GraphicsManager.cc
===================================================================
--- code/branches/mac_osx/src/libraries/core/GraphicsManager.cc	2011-03-07 18:15:02 UTC (rev 8042)
+++ code/branches/mac_osx/src/libraries/core/GraphicsManager.cc	2011-03-08 05:26:51 UTC (rev 8043)
@@ -313,7 +313,7 @@
         this->ogreWindowEventListener_->windowResized(renderWindow_);
 
         Ogre::WindowEventUtilities::addWindowEventListener(this->renderWindow_, ogreWindowEventListener_.get());
-		
+
 // HACK
 #ifdef ORXONOX_PLATFORM_APPLE
         //INFO: This will give our window focus, and not lock it to the terminal
@@ -322,7 +322,7 @@
         SetFrontProcess(&psn);
 #endif
 // End of HACK
-		
+
         // create a full screen default viewport
         // Note: This may throw when adding a viewport with an existing z-order!
         //       But in our case we only have one viewport for now anyway, therefore

Modified: code/branches/mac_osx/src/libraries/core/PathConfig.cc
===================================================================
--- code/branches/mac_osx/src/libraries/core/PathConfig.cc	2011-03-07 18:15:02 UTC (rev 8042)
+++ code/branches/mac_osx/src/libraries/core/PathConfig.cc	2011-03-08 05:26:51 UTC (rev 8043)
@@ -205,8 +205,6 @@
             // Get user directory
 #ifdef ORXONOX_PLATFORM_UNIX
             char* userDataPathPtr(getenv("HOME"));
-#elif ORXONOX_PLATFORM_APPLE
-            char* userDataPathPtr(getenv("HOME"));
 #else
             char* userDataPathPtr(getenv("APPDATA"));
 #endif

Modified: code/branches/mac_osx/src/orxonox/MoodManager.cc
===================================================================
--- code/branches/mac_osx/src/orxonox/MoodManager.cc	2011-03-07 18:15:02 UTC (rev 8042)
+++ code/branches/mac_osx/src/orxonox/MoodManager.cc	2011-03-08 05:26:51 UTC (rev 8043)
@@ -49,8 +49,8 @@
         oldMood_ = MoodManager::defaultMood_;
 
         // Checking for the existence of the folder for the default mood
-        const std::string& patha = "ambient/" + MoodManager::defaultMood_ + "/.";
-        if (!Resource::exists(patha))
+        const std::string& path = "ambient/" + MoodManager::defaultMood_ + "/.";
+        if (!Resource::exists(path))
         {
             // TODO: Non-fatal error handling (non-critical resource missing)
             COUT(2) << "Mood Warning: Folder for default mood (" << MoodManager::defaultMood_ << ") does not exist!" << std::endl;

Modified: code/branches/mac_osx/src/orxonox/sound/SoundManager.cc
===================================================================
--- code/branches/mac_osx/src/orxonox/sound/SoundManager.cc	2011-03-07 18:15:02 UTC (rev 8042)
+++ code/branches/mac_osx/src/orxonox/sound/SoundManager.cc	2011-03-08 05:26:51 UTC (rev 8043)
@@ -82,7 +82,7 @@
         bool bDisableSound_ = false;
         SetConfigValue(bDisableSound_, false);
         if (bDisableSound_)
-            ThrowException(InitialisationAborted, "Sound: Not loading at all");        
+            ThrowException(InitialisationAborted, "Sound: Not loading at all");
         if (!alutInitWithoutContext(NULL, NULL))
             ThrowException(InitialisationFailed, "Sound Error: ALUT initialisation failed: " << alutGetErrorString(alutGetError()));
         Loki::ScopeGuard alutExitGuard = Loki::MakeGuard(&alutExit);
@@ -130,10 +130,10 @@
 
         GameMode::setPlaysSound(true);
         Loki::ScopeGuard resetPlaysSoundGuard = Loki::MakeGuard(&GameMode::setPlaysSound, false);
-        
+
         // Get some information about the sound
         if (const char* version = alGetString(AL_VERSION))
-            COUT(4) << "Sound: --- OpenAL Version: " << version << std::endl;            
+            COUT(4) << "Sound: --- OpenAL Version: " << version << std::endl;
         if (const char* vendor = alGetString(AL_VENDOR))
             COUT(4) << "Sound: --- OpenAL Vendor : " << vendor << std::endl;
         if (const char* types = alutGetMIMETypes(ALUT_LOADER_BUFFER))