Changeset 5929 for code/trunk/src/orxonox/overlays

Timestamp:

Oct 12, 2009, 8:20:07 PM (15 years ago)

Author:

rgrieder

Message:

Merged core5 branch back to the trunk.
Key features include clean level unloading and an extended XML event system.

Two important notes:
Delete your keybindings.ini files! * or you will still get parser errors when loading the key bindings.
Delete build_dir/lib/modules/libgamestates.module! * or orxonox won't start.
Best thing to do is to delete the build folder

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/overlays/CMakeLists.txt (modified) (1 diff)
• src/orxonox/overlays/InGameConsole.cc (modified) (3 diffs)
• src/orxonox/overlays/InGameConsole.h (modified) (1 diff)
• src/orxonox/overlays/Map.cc (modified) (2 diffs)
• src/orxonox/overlays/OrxonoxOverlay.h (modified) (1 diff)
• src/orxonox/overlays/OverlayGroup.cc (modified) (1 diff)

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

@@ -3 +3 @@
   OverlayGroup.cc
 
+COMPILATION_BEGIN OverlayCompilation.cc
   InGameConsole.cc
   Map.cc
+COMPILATION_END
 )

code/trunk/src/orxonox/overlays/InGameConsole.cc

@@ -41 +41 @@
 #include <OgreFont.h>
 
+#include "util/Clock.h"
+#include "util/Convert.h"
 #include "util/Math.h"
-#include "util/Convert.h"
 #include "util/UTFStringConversions.h"
-#include "core/Clock.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
 #include "core/ConsoleCommand.h"
+#include "core/ScopedSingletonManager.h"
 #include "core/input/InputManager.h"
 #include "core/input/InputState.h"
@@ -61 +62 @@
 
     InGameConsole* InGameConsole::singletonPtr_s = 0;
+    ManageScopedSingleton(InGameConsole, ScopeID::Graphics, false);
 
     /**
@@ -85 +87 @@
 
         this->setConfigValues();
+        this->initialise();
     }
 

code/trunk/src/orxonox/overlays/InGameConsole.h

@@ -50 +50 @@
 
         void initialise();
-        void destroy();
         void setConfigValues();
 

code/trunk/src/orxonox/overlays/Map.cc

@@ -290 +290 @@
        for(ObjectList<orxonox::RadarViewable>::iterator it = ObjectList<orxonox::RadarViewable>::begin();
             it!=ObjectList<orxonox::RadarViewable>::end();
-            it++)
+            ++it)
         {
             //COUT(0) << "Radar_Position: " << it->getRVWorldPosition() << std::endl;
@@ -392 +392 @@
         for(ObjectList<orxonox::Map>::iterator it = ObjectList<orxonox::Map>::begin();
             it!=ObjectList<orxonox::Map>::end();
-            it++)
+            ++it)
         {
         //Map * m = it->getMap();

code/trunk/src/orxonox/overlays/OrxonoxOverlay.h

@@ -213 +213 @@
   };
 
-  SUPER_FUNCTION(7, OrxonoxOverlay, changedOwner, false);
-  SUPER_FUNCTION(8, OrxonoxOverlay, changedOverlayGroup, false);
+  SUPER_FUNCTION(6, OrxonoxOverlay, changedOwner, false);
+  SUPER_FUNCTION(7, OrxonoxOverlay, changedOverlayGroup, false);
 }
 

code/trunk/src/orxonox/overlays/OverlayGroup.cc

@@ -61 +61 @@
     {
         for (std::set<OrxonoxOverlay*>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
-            delete (*it);
+            (*it)->destroy();
     }