[Orxonox-commit 4154] r8825 - in code/branches/output: data/overlays src/modules/overlays/hud

[landauf at orxonox.net]

Author: landauf
Date: 2011-08-06 11:07:35 +0200 (Sat, 06 Aug 2011)
New Revision: 8825

Modified:
   code/branches/output/data/overlays/debug.oxo
   code/branches/output/src/modules/overlays/hud/ChatOverlay.cc
Log:
There's a bug in ogre 1.7 (?) causing the first text overlay with a specific font not being shown (until the caption is changed or the window resized). As a result, the "Frames per second" text is not visible in the debug overlay and chat is only visible after the 2nd line of chat is printed. I don't care about the first problem, but I "fixed" the second problem by making the chat overlay not the first element in the XML template. Now DeathMessage is first, but that's fine because its caption is set at a later point when it will work anyway.

Also reordered the chat messages in the chat overlay.

Modified: code/branches/output/data/overlays/debug.oxo
===================================================================
--- code/branches/output/data/overlays/debug.oxo	2011-08-04 21:54:03 UTC (rev 8824)
+++ code/branches/output/data/overlays/debug.oxo	2011-08-06 09:07:35 UTC (rev 8825)
@@ -39,14 +39,6 @@
 
 <Template name="defaultHUD">
   <OverlayGroup name = "defaultHUD" scale = "1, 1">
-    <ChatOverlay
-     name     = "chat"
-     position = "0.03, 0.08"
-     font     = "VeraMono"
-     caption  = ""
-     textsize = 0.025
-    />
-
     <KillMessage
      name     = "killmessage"
      position = "0.5, 0.15"
@@ -83,5 +75,13 @@
      align    = "center"
     />
 
+    <ChatOverlay
+     name     = "chat"
+     position = "0.03, 0.08"
+     font     = "VeraMono"
+     caption  = ""
+     textsize = 0.025
+    />
+
   </OverlayGroup>
 </Template>

Modified: code/branches/output/src/modules/overlays/hud/ChatOverlay.cc
===================================================================
--- code/branches/output/src/modules/overlays/hud/ChatOverlay.cc	2011-08-04 21:54:03 UTC (rev 8824)
+++ code/branches/output/src/modules/overlays/hud/ChatOverlay.cc	2011-08-06 09:07:35 UTC (rev 8825)
@@ -108,7 +108,7 @@
     {
         this->text_->setCaption("");
 
-        for (std::list<Ogre::DisplayString>::reverse_iterator it = this->messages_.rbegin(); it != this->messages_.rend(); ++it)
+        for (std::list<Ogre::DisplayString>::iterator it = this->messages_.begin(); it != this->messages_.end(); ++it)
         {
             this->text_->setCaption(this->text_->getCaption() + "\n" + (*it));
         }