Changeset 2710 for code/trunk/src/orxonox

Timestamp:

Feb 28, 2009, 7:46:37 PM (16 years ago)

Author:

rgrieder

Message:

Merged buildsystem3 containing buildsystem2 containing Adi's buildsystem branch back to the trunk.
Please update the media directory if you were not using buildsystem3 before.

Location:

code/trunk

Files:

• . (modified) (2 props)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/CameraManager.cc (modified) (1 prop)
• src/orxonox/CameraManager.h (modified) (1 prop)
• src/orxonox/Main.cc (modified) (7 diffs)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/OrxonoxStableHeaders.h (deleted)
• src/orxonox/PrecompiledHeaderFiles.cc (deleted)
• src/orxonox/Settings.cc (deleted)
• src/orxonox/Settings.h (deleted)
• src/orxonox/gamestates/CMakeLists.txt (modified) (2 diffs, 1 prop)
• src/orxonox/gamestates/GSGraphics.cc (modified) (13 diffs)
• src/orxonox/gamestates/GSGraphics.h (modified) (2 diffs)
• src/orxonox/gamestates/GSLevel.cc (modified) (4 diffs)
• src/orxonox/gamestates/GSLevel.h (modified) (1 diff)
• src/orxonox/gamestates/GSRoot.cc (modified) (6 diffs)
• src/orxonox/gamestates/GSRoot.h (modified) (1 diff)
• src/orxonox/gui/CMakeLists.txt (modified) (1 diff)
• src/orxonox/gui/GUIManager.cc (modified) (3 diffs)
• src/orxonox/gui/GUIManager.h (modified) (2 diffs)
• src/orxonox/gui/OgreCEGUIRenderer.cpp (deleted)
• src/orxonox/gui/OgreCEGUIRenderer.h (deleted)
• src/orxonox/gui/OgreCEGUIResourceProvider.cpp (deleted)
• src/orxonox/gui/OgreCEGUIResourceProvider.h (deleted)
• src/orxonox/gui/OgreCEGUITexture.cpp (deleted)
• src/orxonox/gui/OgreCEGUITexture.h (deleted)
• src/orxonox/objects/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/objects/Level.cc (modified) (3 diffs, 1 prop)
• src/orxonox/objects/Level.h (modified) (1 prop)
• src/orxonox/objects/collisionshapes (modified) (1 prop)
• src/orxonox/objects/collisionshapes/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/objects/controllers/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/objects/gametypes/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/gametypes/Gametype.cc (modified) (1 diff)
• src/orxonox/objects/infos/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/objects/items/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/pickup/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/objects/pickup/Usable.h (modified) (1 prop)
• src/orxonox/objects/quest/AddQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/AddQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/AddQuestHint.cc (modified) (1 prop)
• src/orxonox/objects/quest/AddQuestHint.h (modified) (1 prop)
• src/orxonox/objects/quest/AddReward.cc (modified) (1 prop)
• src/orxonox/objects/quest/AddReward.h (modified) (1 prop)
• src/orxonox/objects/quest/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) (1 prop)
• src/orxonox/objects/quest/ChangeQuestStatus.h (modified) (1 prop)
• src/orxonox/objects/quest/CompleteQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/CompleteQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/FailQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/FailQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/GlobalQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/GlobalQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/LocalQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/LocalQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/Quest.cc (modified) (1 prop)
• src/orxonox/objects/quest/Quest.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestDescription.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestDescription.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestEffect.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestEffect.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestHint.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestHint.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestItem.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestItem.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestManager.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestManager.h (modified) (1 prop)
• src/orxonox/objects/quest/Rewardable.cc (modified) (1 prop)
• src/orxonox/objects/quest/Rewardable.h (modified) (1 prop)
• src/orxonox/objects/weaponSystem/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/objects/weaponSystem/WeaponPack.cc (modified) (1 prop)
• src/orxonox/objects/weaponSystem/WeaponPack.h (modified) (1 prop)
• src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) (1 prop)
• src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) (1 prop)
• src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/weaponSystem/projectiles/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/weaponSystem/weapons/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/weaponSystem/weapons/Fusion.cc (modified) (1 prop)
• src/orxonox/objects/weaponSystem/weapons/Fusion.h (modified) (1 prop)
• src/orxonox/objects/worldentities/Backlight.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/Backlight.h (modified) (1 prop)
• src/orxonox/objects/worldentities/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/objects/worldentities/Camera.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/Camera.h (modified) (1 prop)
• src/orxonox/objects/worldentities/MobileEntity.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/MobileEntity.h (modified) (1 prop)
• src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/ParticleSpawner.h (modified) (1 prop)
• src/orxonox/objects/worldentities/Planet.cc (modified) (3 diffs)
• src/orxonox/objects/worldentities/Planet.h (modified) (3 diffs)
• src/orxonox/objects/worldentities/StaticEntity.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/StaticEntity.h (modified) (1 prop)
• src/orxonox/objects/worldentities/pawns/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/worldentities/triggers/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/Trigger.h (modified) (1 prop)
• src/orxonox/orxonox.vcproj.user (copied) (copied from code/branches/buildsystem3/src/orxonox/orxonox.vcproj.user)
• src/orxonox/overlays/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/overlays/console/CMakeLists.txt (modified) (1 diff)
• src/orxonox/overlays/debug/CMakeLists.txt (modified) (1 diff)
• src/orxonox/overlays/hud/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/overlays/hud/HUDBar.cc (modified) (1 diff)
• src/orxonox/overlays/notifications/CMakeLists.txt (modified) (1 diff, 1 prop)
• src/orxonox/overlays/stats/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/pch (copied) (copied from code/branches/buildsystem3/src/orxonox/pch)
• src/orxonox/pch/havepch (copied) (copied from code/branches/buildsystem3/src/orxonox/pch/havepch)
• src/orxonox/pch/havepch/OrxonoxStableHeaders.h (copied) (copied from code/branches/buildsystem3/src/orxonox/pch/havepch/OrxonoxStableHeaders.h)
• src/orxonox/pch/havepch/PrecompiledHeaderFiles.cc (copied) (copied from code/branches/buildsystem3/src/orxonox/pch/havepch/PrecompiledHeaderFiles.cc)
• src/orxonox/pch/nopch (copied) (copied from code/branches/buildsystem3/src/orxonox/pch/nopch)
• src/orxonox/pch/nopch/OrxonoxStableHeaders.h (copied) (copied from code/branches/buildsystem3/src/orxonox/pch/nopch/OrxonoxStableHeaders.h)
• src/orxonox/tolua (deleted)
• src/orxonox/tools/CMakeLists.txt (modified) (2 diffs)

code/trunk/src/orxonox/CMakeLists.txt

@@ -1 @@
-SET( ORXONOX_SRC_FILES
+ #
+ #             ORXONOX - the hottest 3D action shooter ever to exist
+ #                             > www.orxonox.net <
+ #
+ #        This program is free software; you can redistribute it and/or
+ #         modify it under the terms of the GNU General Public License
+ #        as published by the Free Software Foundation; either version 2
+ #            of the License, or (at your option) any later version.
+ #
+ #       This program is distributed in the hope that it will be useful,
+ #        but WITHOUT ANY WARRANTY; without even the implied warranty of
+ #        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ #                 GNU General Public License for more details.
+ #
+ #   You should have received a copy of the GNU General Public License along
+ #      with this program; if not, write to the Free Software Foundation,
+ #     Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ #
+
+SET_SOURCE_FILES(ORXONOX_SRC_FILES
   CameraManager.cc
   GraphicsEngine.cc
@@ -6 +25 @@
   PawnManager.cc
   PlayerManager.cc
-  Settings.cc
-  
-  tolua/tolua_bind.cc
 )
+ADD_SUBDIRECTORY(gamestates)
+ADD_SUBDIRECTORY(gui)
+ADD_SUBDIRECTORY(objects)
+ADD_SUBDIRECTORY(overlays)
+ADD_SUBDIRECTORY(tools)
+GET_ALL_HEADER_FILES(ORXONOX_HDR_FILES)
+SET(ORXONOX_FILES ${ORXONOX_SRC_FILES} ${ORXONOX_HDR_FILES})
 
-ADD_SOURCE_DIRECTORY(ORXONOX_SRC_FILES gamestates)
-ADD_SOURCE_DIRECTORY(ORXONOX_SRC_FILES gui)
-ADD_SOURCE_DIRECTORY(ORXONOX_SRC_FILES objects)
-ADD_SOURCE_DIRECTORY(ORXONOX_SRC_FILES overlays)
-ADD_SOURCE_DIRECTORY(ORXONOX_SRC_FILES tools)
+GENERATE_SOURCE_GROUPS(${ORXONOX_FILES})
+GENERATE_TOLUA_BINDINGS(Orxonox ORXONOX_FILES INPUTFILES gui/GUIManager.h)
 
-GET_TARGET_PROPERTY(TOLUA_EXE tolua_orxonox LOCATION)
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.h
-  COMMAND ${TOLUA_EXE} -n Orxonox -o ../../src/orxonox/tolua/tolua_bind.cc -H ../../src/orxonox/tolua/tolua_bind.h ../../src/orxonox/tolua/tolua.pkg
-  DEPENDS
-    tolua_orxonox
-    tolua/tolua.pkg
-    gui/GUIManager.h
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
-)
+# Not using precompiled header files: Avoid dependencies
+INCLUDE_DIRECTORIES(pch/nopch)
 
-
-ADD_EXECUTABLE( orxonox ${ORXONOX_SRC_FILES} )
+ADD_EXECUTABLE(orxonox ${ORXONOX_FILES})
+GET_TARGET_PROPERTY(_exec_loc orxonox LOCATION)
+GET_FILENAME_COMPONENT(_exec_name ${_exec_loc} NAME)
+SET(ORXONOX_EXECUTABLE_NAME ${_exec_name} CACHE INTERNAL "")
 
 IF(NETWORKTRAFFIC_TESTING_ENABLED)
-
-  SET( ORXONOXS_SRC_FILES
+  SET(ORXONOXS_SRC_FILES
     GraphicsEngine.cc
     objects/Camera.cc
     CameraManager.cc
   )
-
-  ADD_LIBRARY(orxonoxs SHARED ${ORXONOX_SRC_FILES})
+  ADD_LIBRARY(orxonoxs SHARED ${ORXONOXS_SRC_FILES})
 ENDIF(NETWORKTRAFFIC_TESTING_ENABLED)
 
-TARGET_LINK_LIBRARIES( orxonox
-  ${OGRE_LIBRARIES}
-  ${CEGUI_LIBRARIES}
-  lua_orxonox
-  ceguilua_orxonox
-  tinyxml_orxonox
-  tolualib_orxonox
-  BulletDynamics
-  BulletCollision
-  LinearMath
+TARGET_LINK_LIBRARIES(orxonox
+  ${OGRE_LIBRARY}
+  ${CEGUI_LIBRARY}
+  ${LUA_LIBRARIES}
+  ${CEGUILUA_LIBRARY}
+  ${Boost_SYSTEM_LIBRARY}
+  ogreceguirenderer_orxonox
+  tinyxml++_orxonox
+  tolua++_orxonox
+  bullet_orxonox
   util
   core
-  audio
   network
+  #audio
 )
 
+ORXONOX_INSTALL(orxonox)
+
+
+# When using Visual Studio we want to use the output directory as working
+# directory and we also want to specify where the external dlls
+# (lua, ogre, etc.) are. The problem hereby is that these information cannot
+# be specified in CMake because they are not stored in the actual project file.
+# This workaround will create a configured *.vcproj.user file that holds the
+# right values. When starting the solution for the first time,
+# these get written to the *vcproj.yourPCname.yourname.user
+IF(MSVC)
+  IF(CMAKE_CL_64)
+    SET(MSVC_PLATFORM "x64")
+  ELSE()
+    SET(MSVC_PLATFORM "Win32")
+  ENDIF()
+  STRING(REGEX REPLACE "^Visual Studio ([0-9][0-9]?) .*$" "\\1"
+         VISUAL_STUDIO_VERSION_SIMPLE "${CMAKE_GENERATOR}")
+  CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/orxonox.vcproj.user" "${CMAKE_CURRENT_BINARY_DIR}/orxonox.vcproj.user")
+ENDIF(MSVC)

code/trunk/src/orxonox/Main.cc

@@ -30 +30 @@
  /**
  @file
- @brief Entry point of the program. Platform specific code.
+ @brief Entry point of the program.
   */
 
@@ -38 +38 @@
 #include <cassert>
 
-#include "util/OrxonoxPlatform.h"
+#include "OrxonoxConfig.h"
 #include "util/Debug.h"
 #include "util/SignalHandler.h"
@@ -57 +57 @@
 #include "gamestates/GSIOConsole.h"
 
-#if ORXONOX_PLATFORM == ORXONOX_PLATFORM_APPLE
+#ifdef ORXONOX_PLATFORM_APPLE
 #include <CoreFoundation/CoreFoundation.h>
 
@@ -85 +85 @@
 
 
-//#ifdef __cplusplus
-//extern "C" {
-//#endif
-
 SetCommandLineArgument(settingsFile, "orxonox.ini");
+SetCommandLineArgument(configFileDirectory, "");
 
 int main(int argc, char** argv)
@@ -95 +92 @@
     using namespace orxonox;
 
-    // create a signal handler (only works for linux)
+    // create a signal handler (only active for linux)
     SignalHandler signalHandler;
-    signalHandler.doCatch(argv[0], "orxonox.log");
+    signalHandler.doCatch(argv[0], Core::getLogPathString() + "orxonox_crash.log");
 
     // Parse command line arguments
@@ -109 +106 @@
         COUT(0) << "Usage:" << std::endl << "orxonox " << CommandLine::getUsageInformation() << std::endl;
     }
+
+    // Do this after parsing the command line to allow customisation
+    Core::postMainInitialisation();
 
     // Create the ConfigFileManager before creating the GameStates in order to have
@@ -157 +157 @@
     return 0;
 }
-
-//#ifdef __cplusplus
-//}
-//#endif

code/trunk/src/orxonox/OrxonoxPrereqs.h

@@ -35 +35 @@
 #define _OrxonoxPrereqs_H__
 
-#include "util/OrxonoxPlatform.h"
+#include "OrxonoxConfig.h"
 
 //-----------------------------------------------------------------------
 // Shared library settings
 //-----------------------------------------------------------------------
-#if (ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32) && !(defined(ORXONOX_STATIC_BUILD) || defined(ORXONOX_NO_EXPORTS))
+#define ORXONOX_NO_EXPORTS // This is an executable that needs no exports
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !(defined(ORXONOX_STATIC_BUILD) || defined(ORXONOX_NO_EXPORTS))
 #  ifdef ORXONOX_SHARED_BUILD
 #    define _OrxonoxExport __declspec(dllexport)

code/trunk/src/orxonox/gamestates/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   GSDedicated.cc
   GSClient.cc
@@ -10 +10 @@
   GSStandalone.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/trunk/src/orxonox/gamestates/GSGraphics.cc

@@ -31 +31 @@
 
 #include <fstream>
+#include <boost/filesystem.hpp>
+
 #include <OgreCompositorManager.h>
 #include <OgreConfigFile.h>
@@ -43 +45 @@
 #include <OgreWindowEventUtilities.h>
 
+#include "SpecialConfig.h"
 #include "util/Debug.h"
 #include "util/Exception.h"
+#include "util/String.h"
+#include "util/SubString.h"
 #include "core/ConsoleCommand.h"
 #include "core/ConfigValueIncludes.h"
@@ -57 +62 @@
 #include "gui/GUIManager.h"
 #include "tools/WindowEventListener.h"
-#include "Settings.h"
 
 // for compatibility
@@ -92 +96 @@
         SetConfigValue(ogreConfigFile_,  "ogre.cfg")
             .description("Location of the Ogre config file");
-        SetConfigValue(ogrePluginsFile_, "plugins.cfg")
-            .description("Location of the Ogre plugins file");
+        SetConfigValue(ogrePluginsFolder_, ORXONOX_OGRE_PLUGINS_FOLDER)
+            .description("Folder where the Ogre plugins are located.");
+        SetConfigValue(ogrePlugins_, ORXONOX_OGRE_PLUGINS)
+            .description("Comma separated list of all plugins to load.");
         SetConfigValue(ogreLogFile_,     "ogre.log")
             .description("Logfile for messages from Ogre. Use \"\" to suppress log file creation.");
@@ -102 +108 @@
         SetConfigValue(ogreLogLevelCritical_, 2)
             .description("Corresponding orxonox debug level for ogre Critical");
-        SetConfigValue(defaultMasterKeybindings_, "def_masterKeybindings.ini")
-            .description("Filename of default master keybindings.");
     }
 
@@ -115 +119 @@
         // Ogre setup procedure
         setupOgre();
+        // load all the required plugins for Ogre
+        loadOgrePlugins();
+        // read resource declaration file
         this->declareResources();
-        this->loadRenderer();    // creates the render window
+        // Reads ogre config and creates the render window
+        this->loadRenderer();
+
         // TODO: Spread this so that this call only initialises things needed for the Console and GUI
         this->initialiseResources();
@@ -127 +136 @@
         // load debug overlay
         COUT(3) << "Loading Debug Overlay..." << std::endl;
-        this->debugOverlay_ = new XMLFile(Settings::getDataPath() + "overlay/debug.oxo");
+        this->debugOverlay_ = new XMLFile((Core::getMediaPath() / "overlay" / "debug.oxo").file_string());
         Loader::open(debugOverlay_);
 
@@ -138 +147 @@
         // Configure master input state with a KeyBinder
         masterKeyBinder_ = new KeyBinder();
-        masterKeyBinder_->loadBindings("masterKeybindings.ini", defaultMasterKeybindings_);
+        masterKeyBinder_->loadBindings("masterKeybindings.ini");
         inputManager_->getMasterInputState()->addKeyHandler(masterKeyBinder_);
 
@@ -200 +209 @@
         delete this->ogreRoot_;
 
-//#if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
         // delete the ogre log and the logManager (since we have created it).
         this->ogreLogger_->getDefaultLog()->removeListener(this);
         this->ogreLogger_->destroyLog(Ogre::LogManager::getSingleton().getDefaultLog());
         delete this->ogreLogger_;
-//#endif
 
         delete graphicsEngine_;
@@ -276 +283 @@
         COUT(3) << "Setting up Ogre..." << std::endl;
 
-        // TODO: LogManager doesn't work on oli platform. The why is yet unknown.
-//#if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
+        if (ogreConfigFile_ == "")
+        {
+            COUT(2) << "Warning: Ogre config file set to \"\". Defaulting to config.cfg" << std::endl;
+            ModifyConfigValue(ogreConfigFile_, tset, "config.cfg");
+        }
+        if (ogreLogFile_ == "")
+        {
+            COUT(2) << "Warning: Ogre log file set to \"\". Defaulting to ogre.log" << std::endl;
+            ModifyConfigValue(ogreLogFile_, tset, "ogre.log");
+        }
+
+        boost::filesystem::path ogreConfigFilepath(Core::getConfigPath() / this->ogreConfigFile_);
+        boost::filesystem::path ogreLogFilepath(Core::getLogPath() / this->ogreLogFile_);
+
         // create a new logManager
+        // Ogre::Root will detect that we've already created a Log
         ogreLogger_ = new Ogre::LogManager();
         COUT(4) << "Ogre LogManager created" << std::endl;
@@ -284 +304 @@
         // create our own log that we can listen to
         Ogre::Log *myLog;
-        if (this->ogreLogFile_ == "")
-            myLog = ogreLogger_->createLog("ogre.log", true, false, true);
-        else
-            myLog = ogreLogger_->createLog(this->ogreLogFile_, true, false, false);
+        myLog = ogreLogger_->createLog(ogreLogFilepath.file_string(), true, false, false);
         COUT(4) << "Ogre Log created" << std::endl;
 
         myLog->setLogDetail(Ogre::LL_BOREME);
         myLog->addListener(this);
-//#endif
-
-        // Root will detect that we've already created a Log
+
         COUT(4) << "Creating Ogre Root..." << std::endl;
 
-        if (ogrePluginsFile_ == "")
-        {
-            COUT(2) << "Warning: Ogre plugins file set to \"\". Defaulting to plugins.cfg" << std::endl;
-            ModifyConfigValue(ogrePluginsFile_, tset, "plugins.cfg");
-        }
-        if (ogreConfigFile_ == "")
-        {
-            COUT(2) << "Warning: Ogre config file set to \"\". Defaulting to config.cfg" << std::endl;
-            ModifyConfigValue(ogreConfigFile_, tset, "config.cfg");
-        }
-        if (ogreLogFile_ == "")
-        {
-            COUT(2) << "Warning: Ogre log file set to \"\". Defaulting to ogre.log" << std::endl;
-            ModifyConfigValue(ogreLogFile_, tset, "ogre.log");
-        }
-
         // check for config file existence because Ogre displays (caught) exceptions if not
-        std::ifstream probe;
-        probe.open(ogreConfigFile_.c_str());
-        if (!probe)
+        if (!boost::filesystem::exists(ogreConfigFilepath))
         {
             // create a zero sized file
             std::ofstream creator;
-            creator.open(ogreConfigFile_.c_str());
+            creator.open(ogreConfigFilepath.file_string().c_str());
             creator.close();
         }
-        else
-            probe.close();
-
-        ogreRoot_ = new Ogre::Root(ogrePluginsFile_, ogreConfigFile_, ogreLogFile_);
-
-#if 0 // Ogre 1.4.3 doesn't yet support setDebugOutputEnabled(.)
-#if ORXONOX_PLATFORM != ORXONOX_PLATFORM_WIN32
-        // tame the ogre ouput so we don't get all the mess in the console
-        Ogre::Log* defaultLog = Ogre::LogManager::getSingleton().getDefaultLog();
-        defaultLog->setDebugOutputEnabled(false);
-        defaultLog->setLogDetail(Ogre::LL_BOREME);
-        defaultLog->addListener(this);
-#endif
-#endif
+
+        // Leave plugins file empty. We're going to do that part manually later
+        ogreRoot_ = new Ogre::Root("", ogreConfigFilepath.file_string(), ogreLogFilepath.file_string());
 
         COUT(3) << "Ogre set up done." << std::endl;
+    }
+
+    void GSGraphics::loadOgrePlugins()
+    {
+        // just to make sure the next statement doesn't segfault
+        if (ogrePluginsFolder_ == "")
+            ogrePluginsFolder_ = ".";
+
+        boost::filesystem::path folder(ogrePluginsFolder_);
+        // Do some SubString magic to get the comma separated list of plugins
+        SubString plugins(ogrePlugins_, ",", " ", false, 92, false, 34, false, 40, 41, false, '\0');
+        for (unsigned int i = 0; i < plugins.size(); ++i)
+            ogreRoot_->loadPlugin((folder / plugins[i]).file_string());
     }
 
@@ -357 +356 @@
         try
         {
-            cf.load(Settings::getDataPath() + resourceFile_);
+            cf.load((Core::getMediaPath() / resourceFile_).file_string());
         }
         catch (...)
@@ -383 +382 @@
 
                     Ogre::ResourceGroupManager::getSingleton().addResourceLocation(
-                        std::string(Settings::getDataPath() + archName), typeName, secName);
+                        (Core::getMediaPath() / archName).directory_string(), typeName, secName);
                 }
             }

code/trunk/src/orxonox/gamestates/GSGraphics.h

@@ -60 +60 @@
 
         void setupOgre();
+        void loadOgrePlugins();
         void declareResources();
         void loadRenderer();
@@ -98 +99 @@
         std::string           resourceFile_;             //!< resources file name
         std::string           ogreConfigFile_;           //!< ogre config file name
-        std::string           ogrePluginsFile_;          //!< ogre plugins file name
+        std::string           ogrePluginsFolder_;        //!< Folder where the Ogre plugins are located
+        std::string           ogrePlugins_;              //!< Comma separated list of all plugins to load
         std::string           ogreLogFile_;              //!< log file name for Ogre log messages
         int                   ogreLogLevelTrivial_;      //!< Corresponding Orxonx debug level for LL_TRIVIAL
         int                   ogreLogLevelNormal_;       //!< Corresponding Orxonx debug level for LL_NORMAL
         int                   ogreLogLevelCritical_;     //!< Corresponding Orxonx debug level for LL_CRITICAL
-        std::string           defaultMasterKeybindings_; //!< Filename of default master keybindings.
 
         // console commands

code/trunk/src/orxonox/gamestates/GSLevel.cc

@@ -46 +46 @@
 #include "LevelManager.h"
 #include "PlayerManager.h"
-#include "Settings.h"
 
 namespace orxonox
@@ -76 +75 @@
     {
         SetConfigValue(keyDetectorCallbackCode_, "KeybindBindingStringKeyName=");
-        SetConfigValue(defaultKeybindings_, "def_keybindings.ini")
-            .description("Filename of default keybindings.");
     }
 
@@ -86 +83 @@
             inputState_ = InputManager::getInstance().createInputState<SimpleInputState>("game", 20);
             keyBinder_ = new KeyBinder();
-            keyBinder_->loadBindings("keybindings.ini", defaultKeybindings_);
+            keyBinder_->loadBindings("keybindings.ini");
             inputState_->setHandler(keyBinder_);
 
@@ -205 +202 @@
         std::string levelName;
         CommandLine::getValue("level", &levelName);
-        startFile_ = new XMLFile(Settings::getDataPath() + std::string("levels/") + levelName);
+        startFile_ = new XMLFile(Core::getMediaPathString() + "levels" + CP_SLASH + levelName);
         Loader::open(startFile_);
     }

code/trunk/src/orxonox/gamestates/GSLevel.h

@@ -66 +66 @@
         //##### ConfigValues #####
         std::string           keyDetectorCallbackCode_;
-        //! Filename of default keybindings.
-        std::string           defaultKeybindings_;
 
         // console commands

code/trunk/src/orxonox/gamestates/GSRoot.cc

@@ -44 +44 @@
 #include "tools/Timer.h"
 #include "objects/Tickable.h"
-#include "Settings.h"
-
-#if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
+
+#ifdef ORXONOX_PLATFORM_WINDOWS
 #  ifndef WIN32_LEAN_AND_MEAN
 #    define WIN32_LEAN_AND_MEAN
@@ -63 +62 @@
 namespace orxonox
 {
-    SetCommandLineArgument(dataPath, "").information("PATH");
     SetCommandLineArgument(limitToCPU, 1).information("0: off | #cpu");
 
@@ -71 +69 @@
         , bPaused_(false)
         , timeFactorPauseBackup_(1.0f)
-        , settings_(0)
         , tclBind_(0)
         , tclThreadManager_(0)
@@ -113 +110 @@
         this->luaBind_ = new LuaBind();
 
-        // instantiate Settings class
-        this->settings_ = new Settings();
-
-        std::string dataPath = CommandLine::getValue("dataPath");
-        if (dataPath != "")
-        {
-            if (*dataPath.end() != '/' && *dataPath.end() != '\\')
-                Settings::tsetDataPath(dataPath + "/");
-            else
-                Settings::tsetDataPath(dataPath);
-        }
-
         // initialise TCL
-        this->tclBind_ = new TclBind(Settings::getDataPath());
+        this->tclBind_ = new TclBind(Core::getMediaPathPOSIXString());
         this->tclThreadManager_ = new TclThreadManager(tclBind_->getTclInterpreter());
 
@@ -182 +167 @@
         delete this->tclBind_;
 
-        delete this->settings_;
         delete this->luaBind_;
 
@@ -269 +253 @@
     void GSRoot::setThreadAffinity(unsigned int limitToCPU)
     {
-#if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
+#ifdef ORXONOX_PLATFORM_WINDOWS
         // Get the current process core mask
         DWORD procMask;

code/trunk/src/orxonox/gamestates/GSRoot.h

@@ -81 +81 @@
         bool                  bPaused_;
         float                 timeFactorPauseBackup_;
-        Settings*             settings_;
         TclBind*              tclBind_;
         TclThreadManager*     tclThreadManager_;

code/trunk/src/orxonox/gui/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   GUIManager.cc
-  OgreCEGUIRenderer.cpp
-  OgreCEGUIResourceProvider.cpp
-  OgreCEGUITexture.cpp
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/trunk/src/orxonox/gui/GUIManager.cc

@@ -36 +36 @@
 #include "GUIManager.h"
 
+#include <boost/filesystem.hpp>
 #include <OgreRenderWindow.h>
 #include <OgreRoot.h>
 #include <CEGUI.h>
-#include "ceguilua/CEGUILua.h"
+#include <CEGUIDefaultLogger.h>
+#include <ogreceguirenderer/OgreCEGUIRenderer.h>
+#include "SpecialConfig.h" // Configures the macro below
+#ifdef CEGUILUA_USE_INTERNAL_LIBRARY
+#   include <ceguilua/CEGUILua.h>
+#else
+#   include <CEGUILua.h>
+#endif
+
 #include "util/Exception.h"
 #include "core/input/InputManager.h"
 #include "core/input/SimpleInputState.h"
-#include "core/tolua/tolua_bind.h"
 #include "core/ConsoleCommand.h"
 #include "core/Core.h"
-#include "tolua/tolua_bind.h"
-#include "OgreCEGUIRenderer.h"
-
-#include "lua/lua.hpp"
+#include "ToluaBindCore.h"
+#include "ToluaBindOrxonox.h"
+
+extern "C" {
+#include <lua.h>
+}
 
 namespace orxonox
@@ -100 +110 @@
                 lua_pushnil(luaState_);
                 lua_setglobal(luaState_, "Core");
-            // TODO: deleting the script module fails an assertation.
+            // TODO: deleting the script module fails an assertion.
             // However there is not much we can do about it since it occurs too when
             // we don't open Core or Orxonox. Might be a CEGUI issue.
@@ -141 +151 @@
                 this->luaState_ = this->scriptModule_->getLuaState();
 
+                // Create our own logger to specify the filepath
+                boost::filesystem::path ceguiLogFilepath(Core::getLogPath() / "cegui.log");
+                this->ceguiLogger_ = new DefaultLogger();
+                this->ceguiLogger_->setLogFilename(ceguiLogFilepath.file_string());
+                // set the log level according to ours (translate by subtracting 1)
+                this->ceguiLogger_->setLoggingLevel(
+                    (LoggingLevel)(Core::getSoftDebugLevel(OutputHandler::LD_Logfile) - 1));
+
                 // create the CEGUI system singleton
                 this->guiSystem_ = new System(this->guiRenderer_, this->resourceProvider_, 0, this->scriptModule_);
-
-                // set the log level according to ours (translate by subtracting 1)
-                Logger::getSingleton().setLoggingLevel(
-                    (LoggingLevel)(Core::getSoftDebugLevel(OutputHandler::LD_Logfile) - 1));
 
                 // do this after 'new CEGUI::Sytem' because that creates the lua state in the first place

code/trunk/src/orxonox/gui/GUIManager.h

@@ -42 +42 @@
 #include "core/input/InputInterfaces.h"
 
-namespace orxonox // tolua_export
-{ // tolua_export
+// Forward declaration
+namespace CEGUI { class DefaultLogger; }
+
+// tolua_begin
+namespace orxonox
+{
     /**
     @brief
         Provides a simple interface to CEGUI with tolua methods and console commands
     */
-    class _OrxonoxExport GUIManager : public KeyHandler, public MouseHandler
-    /*
-    class GUIManager { // tolua_export
-    */
+    class _OrxonoxExport GUIManager
+// tolua_end
+        : public KeyHandler, public MouseHandler
+// tolua_begin
     {
+// tolua_end
     public:
         enum State
@@ -117 +122 @@
         CEGUI::ResourceProvider*  resourceProvider_;
         CEGUI::LuaScriptModule*   scriptModule_;
+        CEGUI::DefaultLogger*     ceguiLogger_;
         CEGUI::System*            guiSystem_;
         CEGUI::Imageset*          backgroundImage_;

code/trunk/src/orxonox/objects/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   EventListener.cc
   EventDispatcher.cc
@@ -14 +14 @@
 )
 
-ADD_SOURCE_DIRECTORY(SRC_FILES collisionshapes)
-ADD_SOURCE_DIRECTORY(SRC_FILES controllers)
-ADD_SOURCE_DIRECTORY(SRC_FILES gametypes)
-ADD_SOURCE_DIRECTORY(SRC_FILES infos)
-ADD_SOURCE_DIRECTORY(SRC_FILES items)
-ADD_SOURCE_DIRECTORY(SRC_FILES pickup)
-ADD_SOURCE_DIRECTORY(SRC_FILES quest)
-ADD_SOURCE_DIRECTORY(SRC_FILES weaponSystem)
-ADD_SOURCE_DIRECTORY(SRC_FILES worldentities)
+ADD_SUBDIRECTORY(collisionshapes)
+ADD_SUBDIRECTORY(controllers)
+ADD_SUBDIRECTORY(gametypes)
+ADD_SUBDIRECTORY(infos)
+ADD_SUBDIRECTORY(items)
+ADD_SUBDIRECTORY(pickup)
+ADD_SUBDIRECTORY(quest)
+ADD_SUBDIRECTORY(weaponSystem)
+ADD_SUBDIRECTORY(worldentities)
 
-ADD_SOURCE_FILES(SRC_FILES)

code/trunk/src/orxonox/objects/Level.cc

@@ -35 +35 @@
 #include "core/XMLFile.h"
 #include "core/Template.h"
+#include "core/Core.h"
 
-#include "Settings.h"
 #include "LevelManager.h"
 #include "objects/infos/PlayerInfo.h"
@@ -55 +55 @@
         this->xmlfilename_ = this->getFilename();
 
-        if (this->xmlfilename_.length() >= Settings::getDataPath().length())
-            this->xmlfilename_ = this->xmlfilename_.substr(Settings::getDataPath().length());
+        if (this->xmlfilename_.length() >= Core::getMediaPathString().length())
+            this->xmlfilename_ = this->xmlfilename_.substr(Core::getMediaPathString().length());
     }
 
@@ -97 +97 @@
         mask.include(Class(OverlayGroup)); // HACK to include the ChatOverlay
 
-        this->xmlfile_ = new XMLFile(Settings::getDataPath() + this->xmlfilename_, mask);
+        this->xmlfile_ = new XMLFile(Core::getMediaPathString() + this->xmlfilename_, mask);
 
         Loader::open(this->xmlfile_);

code/trunk/src/orxonox/objects/collisionshapes/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   BoxCollisionShape.cc
   CollisionShape.cc
@@ -8 +8 @@
   WorldEntityCollisionShape.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/trunk/src/orxonox/objects/controllers/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Controller.cc
   HumanController.cc
@@ -6 +6 @@
   ScriptController.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/trunk/src/orxonox/objects/gametypes/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Gametype.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/trunk/src/orxonox/objects/gametypes/Gametype.cc

@@ -43 +43 @@
 #include "objects/worldentities/SpawnPoint.h"
 #include "objects/worldentities/Camera.h"
-#include "Settings.h"
 
 #include "network/Host.h"

code/trunk/src/orxonox/objects/infos/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Bot.cc
   Info.cc
@@ -6 +6 @@
   GametypeInfo.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/trunk/src/orxonox/objects/items/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Item.cc
   Engine.cc
   MultiStateEngine.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/trunk/src/orxonox/objects/pickup/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   PickupSpawner.cc
   BaseItem.cc
@@ -5 +5 @@
   ShipEquipment.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/trunk/src/orxonox/objects/quest/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   AddQuest.cc
   AddQuestHint.cc
@@ -18 +18 @@
   Rewardable.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/trunk/src/orxonox/objects/weaponSystem/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Munition.cc
   Weapon.cc
@@ -8 +8 @@
 )
 
-ADD_SOURCE_DIRECTORY(SRC_FILES munitions)
-ADD_SOURCE_DIRECTORY(SRC_FILES projectiles)
-ADD_SOURCE_DIRECTORY(SRC_FILES weapons)
-
-ADD_SOURCE_FILES(SRC_FILES)
+ADD_SUBDIRECTORY(munitions)
+ADD_SUBDIRECTORY(projectiles)
+ADD_SUBDIRECTORY(weapons)

code/trunk/src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   LaserGunMunition.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/trunk/src/orxonox/objects/weaponSystem/projectiles/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   BillboardProjectile.cc
   ParticleProjectile.cc
   Projectile.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/trunk/src/orxonox/objects/weaponSystem/weapons/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Fusion.cc
   LaserGun.cc
 #  Missile.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/trunk/src/orxonox/objects/worldentities/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   WorldEntity.cc
   StaticEntity.cc
@@ -21 +21 @@
 )
 
-ADD_SOURCE_DIRECTORY(SRC_FILES pawns)
-ADD_SOURCE_DIRECTORY(SRC_FILES triggers)
-
-ADD_SOURCE_FILES(SRC_FILES)
+ADD_SUBDIRECTORY(pawns)
+ADD_SUBDIRECTORY(triggers)

code/trunk/src/orxonox/objects/worldentities/Planet.cc

@@ -74 +74 @@
         if(activeCamera)
         {
-            Real distance = this->getPosition().distance( activeCamera->getWorldPosition() );
+            float distance = this->getPosition().distance( activeCamera->getWorldPosition() );
             //             COUT(2) << distance << std::endl;
-            Real planetRadius = this->getScale();
+            float planetRadius = this->getScale();
 
-            Real newScale = 2 * distance / sqrt(distance*distance - planetRadius*planetRadius);
-            Real tempTest = newScale*(1+Real(this->atmosphereSize)/Real(this->imageSize));
+            float newScale = 2 * distance / sqrt(distance*distance - planetRadius*planetRadius);
+            float tempTest = newScale*(1+float(this->atmosphereSize)/float(this->imageSize));
             newScale = tempTest;
 
@@ -90 +90 @@
     void Planet::init()
     {
-        Real scaleFactor = this->getScale();
+        float scaleFactor = this->getScale();
 
         this->distList.push_back(10.0*scaleFactor);
@@ -103 +103 @@
         this->distList.push_back(55.0*scaleFactor);
 
-        Real reductionValue = 0.2;
+        float reductionValue = 0.2;
 
         this->mesh_.getEntity()->getMesh()->generateLodLevels(distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL, reductionValue);

code/trunk/src/orxonox/objects/worldentities/Planet.h

@@ -71 +71 @@
             }
             
-            inline void setAtmosphereSize(Real size){
+            inline void setAtmosphereSize(float size){
                 this->atmosphereSize = size;
             }
             
-            inline Real getAtmosphereSize(){
+            inline float getAtmosphereSize(){
                 return this->atmosphereSize;
             }
@@ -87 +87 @@
             }
             
-            inline void setImageSize(Real size){
+            inline void setImageSize(float size){
                 this->imageSize = size;
             }
             
-            inline Real getImageSize(){
+            inline float getImageSize(){
                 return this->imageSize;
             }
@@ -106 +106 @@
             std::string atmosphere_;
             Mesh mesh_;
-            Real atmosphereSize;
-            Real imageSize;
+            float atmosphereSize;
+            float imageSize;
             Ogre::Mesh::LodDistanceList distList;
             BillboardSet billboard_;

code/trunk/src/orxonox/objects/worldentities/pawns/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Spectator.cc
   Pawn.cc
   SpaceShip.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/trunk/src/orxonox/objects/worldentities/triggers/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Trigger.cc
   DistanceTrigger.cc
@@ -5 +5 @@
   PlayerTrigger.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/trunk/src/orxonox/overlays/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   OrxonoxOverlay.cc
   OverlayGroup.cc
@@ -5 +5 @@
 )
 
-ADD_SOURCE_DIRECTORY(SRC_FILES console)
-ADD_SOURCE_DIRECTORY(SRC_FILES debug)
-ADD_SOURCE_DIRECTORY(SRC_FILES hud)
-ADD_SOURCE_DIRECTORY(SRC_FILES notifications)
-ADD_SOURCE_DIRECTORY(SRC_FILES stats)
+ADD_SUBDIRECTORY(console)
+ADD_SUBDIRECTORY(debug)
+ADD_SUBDIRECTORY(hud)
+ADD_SUBDIRECTORY(notifications)
+ADD_SUBDIRECTORY(stats)
 
-ADD_SOURCE_FILES(SRC_FILES)

code/trunk/src/orxonox/overlays/console/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   InGameConsole.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/trunk/src/orxonox/overlays/debug/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   DebugFPSText.cc
   DebugRTRText.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/trunk/src/orxonox/overlays/hud/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   HUDBar.cc
   HUDNavigation.cc
@@ -8 +8 @@
   GametypeStatus.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/trunk/src/orxonox/overlays/hud/HUDBar.cc

@@ -117 +117 @@
             if (this->colours_.size() > 0)
             {
-                ColourValue colour1, colour2 = (*this->colours_.rbegin()).second;
-                float value1, value2 = (*this->colours_.rbegin()).first;
+                ColourValue colour1(0, 0, 0, 1);
+                ColourValue colour2 = (*this->colours_.rbegin()).second;
+                float value1(0);
+                float value2 = (*this->colours_.rbegin()).first;
                 for (std::map<float, ColourValue>::reverse_iterator it = this->colours_.rbegin(); it != this->colours_.rend(); ++it)
                 {

code/trunk/src/orxonox/overlays/notifications/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Notification.cc
   NotificationManager.cc
   NotificationQueue.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/trunk/src/orxonox/overlays/stats/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   CreateLines.cc
   Scoreboard.cc
@@ -5 +5 @@
   StatsTest.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/trunk/src/orxonox/tools/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   BillboardSet.cc
   Mesh.cc
@@ -8 +8 @@
   WindowEventListener.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)