Changeset 724

Timestamp:

07/12/09 03:20:07 (13 months ago)

Author:

zoogie

Message:

#116: Display a bit more info about the fullscreen test:

• What resolution is being tested.
• How many seconds remain until the test ends.

Location:

trunk/client/Game2

Files:

• FullscreenTest.cpp (modified) (6 diffs)
• FullscreenTest.h (modified) (2 diffs)

trunk/client/Game2/FullscreenTest.cpp

@@ -34 +34 @@
 #include "FullscreenTest.h"
 
+using boost::format;
+using boost::str;
+
 using namespace HoverRace::Client;
 using namespace HoverRace::Util;
@@ -47 +50 @@
     oldX(oldX), oldY(oldY), oldMonitor(oldMonitor),
     viewport(new MR_2DViewPort()), widgetsInitialized(false),
-    heading(NULL),
+    heading(NULL), subheading(NULL),
     timeRemaining(5)
 {
@@ -54 +57 @@
 FullscreenTest::~FullscreenTest()
 {
+    delete subheading;
     delete heading;
     delete viewport;
@@ -92 +96 @@
 }
 
-void FullscreenTest::InitWidgets(int resY)
+int FullscreenTest::ScaleFont(int i, int resY)
 {
-    Font headingFont("Arial", 20 * resY / 480, true);
+    // Assume that font sizes given are relative to a 640x480 screen.
+    return i * resY / 480;
+}
+
+void FullscreenTest::UpdateSubheading(int resY)
+{
+    // Keep these translations short -- the user doesn't have much time to read them!
+    const char *text = ngettext(
+        "Returning in %d second.",
+        "Returning in %d seconds.",
+        timeRemaining);
+    std::string subheadingStr = str(format(text) % timeRemaining);
+    if (subheading == NULL) {
+        Font subheadingFont("Arial", ScaleFont(16, resY), true);
+        subheading = new StaticText(subheadingStr, subheadingFont, 0x10);
+    }
+    else {
+        subheading->SetText(subheadingStr);
+    }
+}
+
+void FullscreenTest::InitWidgets(int resX, int resY)
+{
+    Font headingFont("Arial", ScaleFont(20, resY), true);
     
-    heading = new StaticText(_("HoverRace fullscreen settings test"), headingFont, 0x08);
+    // Keep these translations short -- the user doesn't have much time to read them!
+    std::string headingStr = _("HoverRace fullscreen test");
+    headingStr += ": ";
+    headingStr += str(format("%dx%d", OS::stdLocale) % resX % resY);
+    heading = new StaticText(headingStr, headingFont, 0x0c);
 }
 
@@ -110 +141 @@
     int resY = dest->GetYRes();
     if (!widgetsInitialized) {
-        InitWidgets(resY);
+        InitWidgets(resX, resY);
         widgetsInitialized = true;
     }
+    UpdateSubheading(resY);
 
     dest->Lock();
@@ -121 +153 @@
     int curY = resY / 2 - heading->GetHeight();
     heading->Blt(leftMargin, curY, viewport);
-    //curY += heading->GetHeight();
+    curY += heading->GetHeight();
+
+    subheading->Blt(leftMargin, curY, viewport);
 
     dest->Unlock();
 }
-

trunk/client/Game2/FullscreenTest.h

@@ -49 +49 @@
 
     private:
-        void InitWidgets(int resY);
+        static int ScaleFont(int i, int resY);
+        void UpdateSubheading(int resY);
+        void InitWidgets(int resX, int resY);
     public:
         void Render(MR_VideoBuffer *dest);
@@ -60 +62 @@
         bool widgetsInitialized;
         VideoServices::StaticText *heading;
+        VideoServices::StaticText *subheading;
 
         int timeRemaining;