Changeset 427Tweet

Timestamp:

Feb 8, 2011, 12:32:03 AM (11 years ago)

Author:

sam

Message:

The most recent interface layout.

Location:

trunk

Files:

• monsterz/gfx/background.png (modified) (previous)
• monsterz/monsterz.cpp (modified) (1 diff)
• monsterz/thumbs.cpp (modified) (2 diffs)
• src/debugfps.cpp (modified) (4 diffs)

trunk/monsterz/monsterz.cpp

@@ -63 +63 @@
     new SdlInput();
     new Interface();
-    new DebugFps(460, 20);
+    new DebugFps(20, 20);
 
     while (!Ticker::Finished())

trunk/monsterz/thumbs.cpp

@@ -71 +71 @@
     for (int n = 0; n < data->npieces; n++)
     {
-        int2 p = int2(444, 380 - 28 * n);
+        int2 p = int2(459, 372 - 28 * n);
         Scene::GetDefault()->AddTile((data->icons << 16) | n, p.x, p.y, 11, 0);
     }
@@ -86 +86 @@
         data->text[n] = new Text(NULL, "monsterz/gfx/font1.png");
         Ticker::Ref(data->text[n]);
-        int3 p = int3(476, 383 - 28 * n, 1);
+        int3 p = int3(492, 374 - 28 * n, 1);
         data->text[n]->SetPos(p);
     }

trunk/src/debugfps.cpp

@@ -37 +37 @@
   : data(new DebugFpsData())
 {
+#if 0
     for (int i = 0; i < 5; i ++)
     {
@@ -43 +44 @@
         Ticker::Ref(data->lines[i]);
     }
+#else
+    data->lines[0] = new Text(NULL, "gfx/font/ascii.png");
+    data->lines[0]->SetPos(int3(x, y, 0));
+    Ticker::Ref(data->lines[0]);
+#endif
 }
 
@@ -51 +57 @@
     char buf[1024];
 
+#if 0
     sprintf(buf, "%2.2f fps (%i)",
             1e3f / Profiler::GetAvg(Profiler::STAT_TICK_FRAME),
@@ -75 +82 @@
             Profiler::GetMax(Profiler::STAT_TICK_FRAME));
     data->lines[4]->SetText(buf);
+#else
+    sprintf(buf, "%2.2f/%2.2f/%2.2f/%2.2f %2.2f fps (%i)",
+            Profiler::GetAvg(Profiler::STAT_TICK_GAME),
+            Profiler::GetAvg(Profiler::STAT_TICK_DRAW),
+            Profiler::GetAvg(Profiler::STAT_TICK_BLIT),
+            Profiler::GetAvg(Profiler::STAT_TICK_FRAME),
+            1e3f / Profiler::GetAvg(Profiler::STAT_TICK_FRAME),
+            Ticker::GetFrameNum());
+    data->lines[0]->SetText(buf);
+#endif
 }
 
 DebugFps::~DebugFps()
 {
+#if 0
     for (int i = 0; i < 5; i ++)
         Ticker::Unref(data->lines[i]);
+#else
+    Ticker::Unref(data->lines[0]);
+#endif
     delete data;
 }