[CHG] The Point class as moved to types.h

git-svn-id: https://wii-tac-toe.googlecode.com/svn/tags/0.6@41 bba1cac1-252d-79fd-420d-80adb1f9fa09

Author: Crayon2000

Makefile

@@ -15,7 +15,7 @@ include $(DEVKITPPC)/wii_rules
 # SOURCES is a list of directories containing source code
 # INCLUDES is a list of directories containing extra header files
 #---------------------------------------------------------------------------------
-TARGET		:=	$(notdir $(CURDIR))
+TARGET		:=	Wii-Tac-Toe
 BUILD		:=	build
 SOURCES		:=	source source/grrlib source/libpng/pngu
 DATA		:=	data

source/game.cpp

@@ -231,13 +231,13 @@ void Game::GameScreen(bool CopyScreen)
 
         // Draw grid content
         Symbol *Sign = new Symbol;
-        for(int x = 0; x < 3; x++)
+        u8 x, y;
+        for(x = 0; x < 3; x++)
         {
-            for(int y = 0; y < 3; y++)
+            for(y = 0; y < 3; y++)
             {
                 Sign->SetPlayer(GameGrid->GetPlayerAtPos(x, y));
-                Sign->SetLeft(Table[x][y].GetX());
-                Sign->SetTop(Table[x][y].GetY());
+                Sign->SetLocation(Table[x][y].GetX(), Table[x][y].GetY());
                 Sign->Paint();
             }
         }

source/game.h

@@ -8,6 +8,7 @@
 #include "cursor.h"
 #include "player.h"
 #include "language.h"
+#include "types.h"
 
 #define TEXT_SIZE 100
 
@@ -77,48 +78,5 @@ class Game
     u8 AIThinkLoop;
     gameMode GameMode;
 };
-
-/**
- * Class used to defines a pixel location onscreen.
- * @author Crayon
- */
-class Point
-{
-private:
-    u16 x, y;
-public:
-    /**
-     * Constructor for the Point class.
-     */
-    Point(u16 x, u16 y)
-    {
-        this->x = x;
-        this->y = y;
-    }
-    /**
-     * Get the x position.
-     */
-    u16 GetX()
-    {
-        return x;
-    }
-    /**
-     * Get the y position.
-     */
-    u16 GetY()
-    {
-        return y;
-    }
-    /**
-     * Set the new position.
-     * @param[in] x Specifies the x-coordinate.
-     * @param[in] y Specifies the y-coordinate.
-     */
-    void setLocation(u16 x, u16 y)
-    {
-        this->x = x;
-        this->y = y;
-    }
-};
 //---------------------------------------------------------------------------
 #endif

source/grid.cpp

@@ -73,11 +73,12 @@ bool Grid::SetPlayer(u8 Player, u8 X, u8 Y)
 void Grid::SetPlayerAI(u8 Player)
 {
     u8 TestBoard[3][3];
+    u8 x, y;
 
     // Test win
-    for(int x = 0; x < 3; x++)
+    for(x = 0; x < 3; x++)
     {
-        for(int y = 0; y < 3; y++)
+        for(y = 0; y < 3; y++)
         {
             memcpy(TestBoard, Board, sizeof(TestBoard));
             if(TestBoard[x][y] == ' ')
@@ -94,9 +95,9 @@ void Grid::SetPlayerAI(u8 Player)
 
     // Test block
     u8 Opponent = (Player == 'X') ? 'O' : 'X';
-    for(int x = 0; x < 3; x++)
+    for(x = 0; x < 3; x++)
     {
-        for(int y = 0; y < 3; y++)
+        for(y = 0; y < 3; y++)
         {
             memcpy(TestBoard, Board, sizeof(TestBoard));
             if(TestBoard[x][y] == ' ')
@@ -144,24 +145,9 @@ u8 Grid::GetPlayerAtPos(u8 X, u8 Y)
  */
 void Grid::Clear()
 {
-    for(int x = 0; x < 3; x++)
-    {
-        for(int y = 0; y < 3; y++)
-        {
-            Board[x][y] = ' ';
-        }
-    }
+    memset(Board, ' ', sizeof(Board));
 }
 
-/**
- * Return the complete grid.
- */
-/*
-u8[][] Grid::GetGrid()
-{
-    return Board;
-}
-*/
 /**
  * Return the winner.
  * @return Winning player.
@@ -237,9 +223,10 @@ bool Grid::IsPlayerWinning(u8 Player)
  */
 bool Grid::IsFilled()
 {
-    for(int x = 0; x < 3; x++)
+    u8 x, y;
+    for(x = 0; x < 3; x++)
     {
-        for(int y = 0; y < 3; y++)
+        for(y = 0; y < 3; y++)
         {
             if(Board[x][y] == ' ')
                 return false;

source/grid.h

@@ -20,7 +20,6 @@ class Grid
     void SetPlayerRandom(u8);
     void SetPlayerAI(u8);
     u8 GetPlayerAtPos(u8, u8);
-    //u8[][] GetGrid();
     u8 GetWinner();
     void Clear();
     bool IsFilled();

source/object.cpp

@@ -59,6 +59,19 @@ void Object::SetTop(float Top)
     this->Top = Top;
 }
 
+/**
+ * Set the left and top position of the object.
+ * @param[in] Left Left in pixel.
+ * @param[in] Top Top in pixel.
+ * @see SetLeft()
+ * @see SetTop()
+ */
+void Object::SetLocation(float Left, float Top)
+{
+    this->Left = Left;
+    this->Top = Top;
+}
+
 /**
  * Get the width of the object.
  * @see SetWidth()
@@ -132,13 +145,6 @@ void Object::SetVisible(bool Visible)
     this->Visible = Visible;
 }
 
-/**
- * Draw an image on screen.
- */
-void Object::Paint()
-{
-}
-
 /**
  * Check if a position is inside the object.
  * @param[in] x X position in pixel.

source/object.h

@@ -24,6 +24,7 @@ class Object
     bool IsVisible();
     void SetLeft(float);
     void SetTop(float);
+    void SetLocation(float, float);
     void SetWidth(unsigned int);
     void SetHeight(unsigned int);
     void SetSize(unsigned int, unsigned int);
@@ -32,7 +33,7 @@ class Object
     void SetVisible(bool);
     bool IsInside(float, float);
 protected:
-    virtual void Paint();
+    virtual void Paint() = 0; /**< Draw an image on screen. */
 
     float Left;         /**< Specifies the x-coordinate of the upper-left corner of the object. */
     float Top;          /**< Specifies the y-coordinate of the upper-left corner of the object. */

source/symbol.cpp

@@ -10,7 +10,7 @@
  */
 Symbol::Symbol() : Object()
 {
-    this->Player = 'X';
+    Player = 'X';
 
     ImgO = GRRLIB_LoadTexture(o);
     ImgX = GRRLIB_LoadTexture(x);
@@ -45,9 +45,9 @@ void Symbol::Paint()
 
 /**
  * Set the current player to draw on the screen.
- * @param[in] Player Player sign, either X or O.
+ * @param[in] APlayer Player sign, either X or O.
  */
-void Symbol::SetPlayer(unsigned char Player)
+void Symbol::SetPlayer(unsigned char APlayer)
 {
-    this->Player = Player;
+    Player = APlayer;
 }

source/types.h

@@ -0,0 +1,62 @@
+//---------------------------------------------------------------------------
+#ifndef TypesH
+#define TypesH
+//---------------------------------------------------------------------------
+
+#include <gccore.h>
+
+/**
+ * Class used to defines a pixel location onscreen.
+ * @author Crayon
+ */
+class Point
+{
+private:
+    u16 x, y;
+public:
+    /**
+     * Constructor for the Point class.
+     * Initializes a point at the origin (0, 0) of the coordinate space.
+     */
+    Point()
+    {
+        this->x = 0;
+        this->y = 0;
+    }
+    /**
+     * Constructor for the Point class.
+     * @param[in] x Specifies the x-coordinate.
+     * @param[in] y Specifies the y-coordinate.
+     */
+    Point(u16 x, u16 y)
+    {
+        this->x = x;
+        this->y = y;
+    }
+    /**
+     * Get the x position.
+     */
+    u16 GetX()
+    {
+        return x;
+    }
+    /**
+     * Get the y position.
+     */
+    u16 GetY()
+    {
+        return y;
+    }
+    /**
+     * Set the new position.
+     * @param[in] x Specifies the x-coordinate.
+     * @param[in] y Specifies the y-coordinate.
+     */
+    void SetLocation(u16 x, u16 y)
+    {
+        this->x = x;
+        this->y = y;
+    }
+};
+//---------------------------------------------------------------------------
+#endif

wii-tac-toe.pnproj

@@ -1 +1 @@
-<Project name="Wii-Tac-Toe"><MagicFolder excludeFolders="CVS;.svn" filter="*.c;*.cpp;*.h" name="source" path="source\"><MagicFolder excludeFolders="CVS;.svn" filter="*.c;*.cpp;*.h" name="grrlib" path="grrlib\"><File path="GRRLIB.c"></File><File path="GRRLIB.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*.c;*.cpp;*.h" name="libjpeg" path="libjpeg\"><File path="jconfig.h"></File><File path="jmorecfg.h"></File><File path="jpeglib.h"></File><File path="jpgogc.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*.c;*.cpp;*.h" name="libpng" path="libpng\"><MagicFolder excludeFolders="CVS;.svn" filter="*.c;*.cpp;*.h" name="pngu" path="pngu\"><File path="pngu.c"></File><File path="pngu.h"></File></MagicFolder><File path="png.h"></File><File path="pngconf.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*.c;*.cpp;*.h" name="mxml" path="mxml\"><File path="mxml.h"></File></MagicFolder><File path="button.cpp"></File><File path="button.h"></File><File path="cursor.cpp"></File><File path="cursor.h"></File><File path="game.cpp"></File><File path="game.h"></File><File path="grid.cpp"></File><File path="grid.h"></File><File path="language.cpp"></File><File path="language.h"></File><File path="main.cpp"></File><File path="main.h"></File><File path="object.cpp"></File><File path="object.h"></File><File path="player.cpp"></File><File path="player.h"></File><File path="symbol.cpp"></File><File path="symbol.h"></File><File path="tools.cpp"></File><File path="tools.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*.h" name="include" path="include\"></MagicFolder><Folder name="fonts"></Folder><Folder name="gfx"></Folder><File path="Makefile"></File></Project>
+<Project name="Wii-Tac-Toe"><MagicFolder excludeFolders="CVS;.svn" filter="*.c;*.cpp;*.h" name="source" path="source\"><MagicFolder excludeFolders="CVS;.svn" filter="*.c;*.cpp;*.h" name="grrlib" path="grrlib\"><File path="GRRLIB.c"></File><File path="GRRLIB.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*.c;*.cpp;*.h" name="libjpeg" path="libjpeg\"><File path="jconfig.h"></File><File path="jmorecfg.h"></File><File path="jpeglib.h"></File><File path="jpgogc.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*.c;*.cpp;*.h" name="libpng" path="libpng\"><MagicFolder excludeFolders="CVS;.svn" filter="*.c;*.cpp;*.h" name="pngu" path="pngu\"><File path="pngu.c"></File><File path="pngu.h"></File></MagicFolder><File path="png.h"></File><File path="pngconf.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*.c;*.cpp;*.h" name="mxml" path="mxml\"><File path="mxml.h"></File></MagicFolder><File path="button.cpp"></File><File path="button.h"></File><File path="cursor.cpp"></File><File path="cursor.h"></File><File path="game.cpp"></File><File path="game.h"></File><File path="grid.cpp"></File><File path="grid.h"></File><File path="language.cpp"></File><File path="language.h"></File><File path="main.cpp"></File><File path="main.h"></File><File path="object.cpp"></File><File path="object.h"></File><File path="player.cpp"></File><File path="player.h"></File><File path="symbol.cpp"></File><File path="symbol.h"></File><File path="tools.cpp"></File><File path="tools.h"></File><File path="types.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*.h" name="include" path="include\"></MagicFolder><Folder name="fonts"></Folder><Folder name="gfx"></Folder><File path="Makefile"></File></Project>