Changeset 331Tweet

Timestamp:

Feb 1, 2011, 11:07:19 PM (10 years ago)

Author:

sam

Message:

Add an Interface class that displays the general interface.

Location:

trunk

Files:

• monsterz/Makefile.am (modified) (1 diff)
• monsterz/board.cpp (modified) (6 diffs)
• monsterz/interface.cpp (added)
• monsterz/interface.h (added)
• monsterz/monsterz.cpp (modified) (2 diffs)
• monsterz/title.cpp (modified) (4 diffs)
• win32/monsterz.vcxproj (modified) (2 diffs)
• win32/monsterz.vcxproj.filters (modified) (2 diffs)

trunk/monsterz/Makefile.am

@@ -3 +3 @@
 
 monsterz_SOURCES = \
-    monsterz.cpp monsterz.h title.cpp title.h \
+    monsterz.cpp monsterz.h title.cpp title.h interface.cpp interface.h \
     board.cpp board.h piece.cpp piece.h mash.cpp mash.h
 monsterz_CXXFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@

trunk/monsterz/board.cpp

@@ -35 +35 @@
     int2 dim;
     int npieces;
-    int screen, board, tiles, icons;
+    int board, tiles, icons;
     int click, whip;
 
@@ -78 +78 @@
     data->dim = dim;
     data->npieces = npieces;
-    data->screen = Tiler::Register(PNG_BACKGROUND, 640, 480, 1.0f);
     data->board = Tiler::Register(PNG_BOARD, 384, 384, 1.0f);
     data->tiles = Tiler::Register(PNG_TILES, 48, 48, 1.0f);
@@ -105 +104 @@
 
     data->scoretext = new Text(NULL, "monsterz/gfx/font2.png");
+    data->scoretext->SetAlign(Text::ALIGN_RIGHT);
     data->scoretext->SetPos(int3(624, 432, 1));
-    data->scoretext->SetAlign(Text::ALIGN_RIGHT);
     Ticker::Ref(data->scoretext);
     data->score = 0;
@@ -224 +223 @@
     Entity::TickDraw(deltams);
 
-    Scene::GetDefault()->AddTile((data->screen << 16) | 0, 0, 0, 10, 0);
-    Scene::GetDefault()->AddTile((data->board << 16) | 0, 24, 72, 1, 0);
+    Scene::GetDefault()->AddTile((data->board << 16) | 0,
+                                 position.x, position.y, 1, 0);
 
     /* Mini monsterz */
@@ -232 +231 @@
         int2 p = int2(444, 380 - 28 * n);
         Scene::GetDefault()->AddTile((data->icons << 16) | n, p.x, p.y, 11, 0);
-    }
-
-    /* Mouse pointer */
-    if (data->oldmouse.x >= 0 && data->oldmouse.y >= 0)
-    {
-        int2 m = data->oldmouse + (int2)(float2)position + int2(-6, 6 - 48);
-        Scene::GetDefault()->AddTile((data->tiles << 16) | 22, m.x, m.y, 20, 0);
     }
 }
@@ -550 +542 @@
     Ticker::Unref(data->emitter);
     Tiler::Deregister(data->board);
-    Tiler::Deregister(data->screen);
     Tiler::Deregister(data->tiles);
     Tiler::Deregister(data->icons);

trunk/monsterz/monsterz.cpp

@@ -25 +25 @@
 #include "title.h"
 #include "board.h"
+#include "interface.h"
 
 #include "debugfps.h"
@@ -65 +66 @@
     new Board(int2(8, 8), 9);
     //new Title();
+    new Interface();
     new DebugFps(460, 20);
 

trunk/monsterz/title.cpp

@@ -31 +31 @@
 
 private:
-    int screen, title, logo;
+    int title, logo;
     int anim[6];
     int event[7];
 
-    enum 
+    enum
     {
         IDLE,
@@ -65 +65 @@
     srand(rand() ^ time(NULL));
 
-    data->screen = Tiler::Register(PNG_BACKGROUND, 640, 480, 1.0f);
     data->logo = Tiler::Register(PNG_LOGO, 380, 181, 1.0f);
     data->title = Tiler::Register(PNG_TITLE, 384, 384, 1.0f);
@@ -204 +203 @@
     }
 
-    Scene::GetDefault()->AddTile((data->screen << 16) | 0, 0, 0, 0, 0);
     Scene::GetDefault()->AddTile((tiler << 16) | id, 24, 72, 1, 0);
     Scene::GetDefault()->AddTile((data->logo << 16) | 0, 26, 250, 2, 0);
@@ -211 +209 @@
 Title::~Title()
 {
-    Tiler::Deregister(data->screen);
     Tiler::Deregister(data->logo);
     Tiler::Deregister(data->title);

trunk/win32/monsterz.vcxproj

@@ -13 +13 @@
   <ItemGroup>
     <ClInclude Include="..\monsterz\board.h" />
+    <ClInclude Include="..\monsterz\interface.h" />
     <ClInclude Include="..\monsterz\mash.h" />
     <ClInclude Include="..\monsterz\monsterz.h" />
@@ -50 +51 @@
   <ItemGroup>
     <ClCompile Include="..\monsterz\board.cpp" />
+    <ClCompile Include="..\monsterz\interface.cpp" />
     <ClCompile Include="..\monsterz\mash.cpp" />
     <ClCompile Include="..\monsterz\monsterz.cpp" />

trunk/win32/monsterz.vcxproj.filters

@@ -89 +89 @@
     </ClInclude>
     <ClInclude Include="..\monsterz\board.h" />
+    <ClInclude Include="..\monsterz\interface.h" />
     <ClInclude Include="..\monsterz\piece.h" />
     <ClInclude Include="..\monsterz\title.h" />
@@ -174 +175 @@
     </ClCompile>
     <ClCompile Include="..\monsterz\board.cpp" />
+    <ClCompile Include="..\monsterz\interface.cpp" />
     <ClCompile Include="..\monsterz\monsterz.cpp" />
     <ClCompile Include="..\monsterz\piece.cpp" />