Changeset 2664 for code/branches/buildsystem3/src/orxonox/overlays

Timestamp:

Feb 14, 2009, 10:53:45 PM (16 years ago)

Author:

rgrieder

Message:

Merged buildsystem2 to buildsystem3.

Note: Bare merge, just resolved conflicts. To testing, no nothing.

Location:

code/branches/buildsystem3

Files:

• . (modified) (2 props)
• 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)

code/branches/buildsystem3/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/branches/buildsystem3/src/orxonox/overlays/console/CMakeLists.txt

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

code/branches/buildsystem3/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/branches/buildsystem3/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/branches/buildsystem3/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)
                 {