Move initializing of cell components to Cell class rather than doing it in grid's Initialize() method

Author: baz606

src/Cell.cpp

@@ -18,6 +18,35 @@ Cell::Cell(Game *game, Game::GameState gameState, Grid *grid)
   mNumOfMines = 0;
 }
 
+void Cell::SetupComponents()
+{
+  // Add rectangle mesh component for the color of the cells
+  auto mesh = new RectangleMeshComponent("RectangleMeshComponent", this, 1);
+  mesh->SetColor(DARKGRAY);
+  mesh->SetBorderColor(BLACK);
+  mesh->SetBorderThickness(3.f);
+  mesh->SetWidth(Cell::LENGTH);
+  mesh->SetHeight(Cell::LENGTH);
+
+  auto textComp = new TextComponent("TextComponent", this, 2);
+  textComp->SetColor(RAYWHITE);
+  textComp->SetFont(GetFontDefault());
+  textComp->SetFontSize(50.f);
+  textComp->SetSpacing(0.f);
+  textComp->SetText(std::to_string(this->GetNumOfMines()));
+  textComp->SetIsShow(false);
+
+  // Add line mesh component for the sealed state of cells
+  auto lineMesh = new LineMeshComponent("LineMeshComponent", this, 2);
+  lineMesh->SetThickness(3.f);
+  lineMesh->SetColor(BLACK);
+  lineMesh->SetLinePair({ this->GetPosition().x - (Cell::LENGTH / 2), this->GetPosition().y - (Cell::LENGTH / 2) },
+                        { this->GetPosition().x + (Cell::LENGTH / 2), this->GetPosition().y + (Cell::LENGTH / 2) });
+  lineMesh->SetLinePair({ this->GetPosition().x + (Cell::LENGTH / 2), this->GetPosition().y - (Cell::LENGTH / 2) },
+                        { this->GetPosition().x - (Cell::LENGTH / 2), this->GetPosition().y + (Cell::LENGTH / 2) });
+
+}
+
 void Cell::UpdateActor(float deltaTime)
 {
   auto mesh = (RectangleMeshComponent*)(GetComponent("RectangleMeshComponent"));

src/Cell.h

@@ -28,6 +28,7 @@ class Cell : public Actor
 public:
   Cell(class Game* game, Game::GameState gameState, class Grid* grid);
 
+  void SetupComponents();
   void UpdateActor(float deltaTime) override;
 
   // Getters/Setters

src/Grid.cpp

@@ -43,31 +43,8 @@ void Grid::Initialize()
       cell->SetIndex(i, j);
       cell->SetCellType(UNEXPOSE);
       mCellList[i][j] = cell;
-
-      // Add rectangle mesh component for the color of the cells
-      auto mesh = new RectangleMeshComponent("RectangleMeshComponent", cell, 1);
-      mesh->SetColor(DARKGRAY);
-      mesh->SetBorderColor(BLACK);
-      mesh->SetBorderThickness(3.f);
-      mesh->SetWidth(Cell::LENGTH);
-      mesh->SetHeight(Cell::LENGTH);
-
-      auto textComp = new TextComponent("TextComponent", cell, 2);
-      textComp->SetColor(RAYWHITE);
-      textComp->SetFont(GetFontDefault());
-      textComp->SetFontSize(50.f);
-      textComp->SetSpacing(0.f);
-      textComp->SetText(std::to_string(cell->GetNumOfMines()));
-      textComp->SetIsShow(false);
-
-      // Add line mesh component for the sealed state of cells
-      auto lineMesh = new LineMeshComponent("LineMeshComponent", cell, 2);
-      lineMesh->SetThickness(3.f);
-      lineMesh->SetColor(BLACK);
-      lineMesh->SetLinePair({ cell->GetPosition().x - (Cell::LENGTH / 2), cell->GetPosition().y - (Cell::LENGTH / 2) },
-                            { cell->GetPosition().x + (Cell::LENGTH / 2), cell->GetPosition().y + (Cell::LENGTH / 2) });
-      lineMesh->SetLinePair({ cell->GetPosition().x + (Cell::LENGTH / 2), cell->GetPosition().y - (Cell::LENGTH / 2) },
-                            { cell->GetPosition().x - (Cell::LENGTH / 2), cell->GetPosition().y + (Cell::LENGTH / 2) });
+      // Setup required components to this cell actor
+      cell->SetupComponents();
     }
   }
 //  SetMines();