change Game to singleton, there is still an error

src/include/Activities/Activity.hpp

@@ -12,9 +12,9 @@ class Game;
 
 class Activity {
  public:
- Activity(Game &game);
+ Activity();
  virtual ~Activity();
- virtual ActivityEnum executeActivity(Game &game);
+ virtual ActivityEnum executeActivity();
 
  private:
 

src/include/Activities/CharacterActivity.hpp

@@ -7,9 +7,9 @@
 
 class CharacterActivity : public Activity {
  public :
- CharacterActivity(Game &game);
+ CharacterActivity();
 
- ActivityEnum executeActivity(Game &game) override;
+ ActivityEnum executeActivity() override;
 
 
  private :

src/include/Activities/FightActivity.hpp

@@ -33,10 +33,10 @@
 
 class FightActivity: public Activity {
  public:
- FightActivity(Game &game);
+ FightActivity();
  ~FightActivity();
 
- ActivityEnum executeActivity(Game &game) override;
+ ActivityEnum executeActivity() override;
  void runCurrentState(Game &game);
 
  private:
@@ -46,10 +46,10 @@ class FightActivity: public Activity {
  std::unique_ptr<FightState> currentFightState;
 
  Enemy initEnemy();
- void runPlayersTurn(Game &game);
- void runEnemiesTurn(Game &game);
- void runDefeat(Game &game);
- void runVictory(Game &game);
+ void runPlayersTurn();
+ void runEnemiesTurn();
+ void runDefeat();
+ void runVictory();
 };
 
 #endif

src/include/Activities/MenuActivity.hpp

@@ -13,10 +13,10 @@
 
 class MenuActivity: public Activity {
  public:
- MenuActivity(Game &game);
+ MenuActivity();
  ~MenuActivity();
 
- ActivityEnum executeActivity(Game &game) override;
+ ActivityEnum executeActivity() override;
 
  private:
  sf::Texture backgroundTX;

src/include/Animations/IncomingBanner.hpp

@@ -9,12 +9,12 @@
 
 class IncomingBanner {
  public:
- IncomingBanner(Game &game);
- IncomingBanner(Game &game, std::string label);
+ IncomingBanner();
+ IncomingBanner(std::string label);
 
  void setNewLabel(std::string newLabel);
- bool runAnimation(Game &game);
- void drawAnimation(sf::RenderWindow* gameWindow);
+ bool runAnimation();
+ void drawAnimation();
 
  private:
  int pastTimeInMillSec = 0;
@@ -23,7 +23,7 @@ class IncomingBanner {
 
  sf::RectangleShape banner;
  sf::Text bannerText;
- void init(Game &game);
+ void init();
 };
 
 #endif

src/include/Animations/TextFadingManager.hpp

@@ -33,7 +33,7 @@ class TextFading {
  float initPosY;
  float initPosX;
 
- void draw(sf::RenderWindow* gameWindow);
+ void draw();
  float computeParabel(float value);
  void setNewParabelPos();
 
@@ -43,9 +43,9 @@ class TextFading {
 
 class TextFadingManager: Animation {
  public:
- void run(sf::RenderWindow* gameWindow, GameStatus &gameStatus);
+ void run();
  void startAnimation(std::string text, sf::Vector2f pos, sf::Color textColor, int textSize, AnimationPath animationPath, int millSecToLive);
- void updateAnimationState(GameStatus &gameStatus);
+ void updateAnimationState();
  TextFading fadingText;
  bool isRunning = false;
 };

src/include/FightEnv.hpp

@@ -11,7 +11,7 @@
 
 class FightEnv {
  public:
- FightEnv(Game &game);
+ FightEnv();
 
  sf::Texture backgroundTX;
  sf::Sprite backgroundSP;

src/include/FightStates/EnemiesTurn.hpp

@@ -8,7 +8,7 @@
 class EnemiesTurn: public FightState {
  public:
  ~EnemiesTurn();
- FightStateEnum run(Game &game, FightEnv &fightEnv) override;
+ FightStateEnum run(FightEnv &fightEnv) override;
 
  private:
 };

src/include/FightStates/FightState.hpp

@@ -10,7 +10,7 @@
 class FightState {
  public:
  virtual ~FightState();
- virtual FightStateEnum run(Game &game, FightEnv &fightEnv);
+ virtual FightStateEnum run(FightEnv &fightEnv);
 };
 
 #endif

src/include/FightStates/PlayersTurn.hpp

@@ -20,7 +20,7 @@ class PlayersTurn: public FightState {
  public:
  PlayersTurn(FightEnv &fightEnv);
  ~PlayersTurn();
- FightStateEnum run(Game &game, FightEnv &fightEnv) override;
+ FightStateEnum run(FightEnv &fightEnv) override;
 
  private:
  PlayerPhase playerPhase = PlayerPhase::PICK_COLOR;
@@ -31,8 +31,8 @@ class PlayersTurn: public FightState {
  bool newColorImageSet = false;
  float passedMillSec = 0.0;
 
- void processAttack(FightEnv &fightEnv, Game &game);
- void changeColoPickerImage(Game &game, FightEnv &fightEnv);
+ void processAttack(FightEnv &fightEnv);
+ void changeColoPickerImage(FightEnv &fightEnv);
  double computeCurrentPixel(double formerPixel, double newPixel, float elapsedRatio);
 
  // Compute damage multiplier

src/include/FightStates/TurnChangeState.hpp

@@ -8,9 +8,9 @@
 
 class TurnChangeState: public FightState {
  public:
- TurnChangeState(Game &gam, FightEnv &fightEnv);
+ TurnChangeState(FightEnv &fightEnv);
  ~TurnChangeState();
- FightStateEnum run(Game &game, FightEnv &fightEnv) override;
+ FightStateEnum run(FightEnv &fightEnv) override;
 
  private:
  IncomingBanner turnChangeBanner;

src/include/Game.hpp

@@ -17,14 +17,16 @@
 class Game {
  public:
  sf::Font mainFont;
- //sf::Music backgroundMusic;
  GameEvents gameEvents;
- RenderEngine renderEngine;
  GameStatus gameStatus;
+ sf::RenderWindow& gameWindow;
 
  Player player = Player("Ipagaxi", 100, 12, {100, 100, 100}, "default_actor_quer.png");
 
- Game(sf::RenderWindow &window, ActivityEnum activity);
+ static Game& getInstance();
+ private:
+ Game();
+ static Game* instance;
 };
 
 #endif

src/include/UIElements/UIBorderedImage.hpp

@@ -4,6 +4,8 @@
 #include <SFML/Graphics.hpp>
 #include <string>
 #include <iostream>
+
+#include "Game.hpp"
 #include "UIElements/UIElement.hpp"
 #include "Defines.hpp"
 
@@ -12,7 +14,7 @@ class UIBorderedImage: public UIElement {
  UIBorderedImage(std::string imageFilePath, std::string borderFilePath);
 
  void setImage(std::string imagePath);
- void draw(sf::RenderWindow* gameWindow) override;
+ void draw() override;
  void setPosition(float x, float y) override;
  sf::Vector2f getPosition() override;
  sf::FloatRect getSize() override;

src/include/UIElements/UIBox.hpp

@@ -7,22 +7,23 @@
 
 #include "UIElements/UIElement.hpp"
 #include "Defines.hpp"
+#include "Game.hpp"
 
 class UIBox : UIElement {
-  public:
-  UIBox(sf::Color fillColor, std::string borderFilePath);
+ public:
+ UIBox(sf::Color fillColor, std::string borderFilePath);
 
-  void draw(sf::RenderWindow* window) override;
-  void setPosition(float x, float y) override;
-  sf::Vector2f getPosition() override;
-  sf::FloatRect getSize() override;
-  void scale(float x, float y) override;
-  void setBackgroundMargin(float x, float y);
+ void draw() override;
+ void setPosition(float x, float y) override;
+ sf::Vector2f getPosition() override;
+ sf::FloatRect getSize() override;
+ void scale(float x, float y) override;
+ void setBackgroundMargin(float x, float y);
 
-  private: 
-  sf::RectangleShape backgroundREC;
-  sf::Texture borderTX;
-  sf::Sprite borderSP;
+ private:
+ sf::RectangleShape backgroundREC;
+ sf::Texture borderTX;
+ sf::Sprite borderSP;
 
 };
 

src/include/UIElements/UIButton.hpp

@@ -27,8 +27,8 @@ class UIButton: public UIElement {
  sf::Sound releaseSound;
 
  void init(std::string fileName);
- void hoverListener(sf::RenderWindow* gameWindow, GameEvents &gameEvents);
- bool buttonContainsMouse(sf::RenderWindow* gameWindow);
+ void hoverListener();
+ bool buttonContainsMouse();
 
  public:
  sf::Font font;
@@ -38,13 +38,13 @@ class UIButton: public UIElement {
  UIButton(std::string labelText, std::string fileName);
  UIButton(std::string fileName);
 
- bool clickListener(sf::RenderWindow* gameWindow, GameEvents &gameEvents);
+ bool clickListener();
 
  void setPosition(float x, float y) override;
  sf::Vector2f getPosition() override;
  sf::FloatRect getSize() override;
 
- void draw(sf::RenderWindow* window) override;
+ void draw() override;
 
  void scale(float x, float y) override;
 };

src/include/UIElements/UIColorPicker.hpp

@@ -28,13 +28,13 @@ class UIColorPicker: public UIElement {
  sf::Image colorIMG;
  sf::Sound releaseSound;
 
- void draw(sf::RenderWindow* window) override;
+ void draw() override;
  void setPosition(float x, float y) override;
  sf::Vector2f getPosition() override;
  sf::FloatRect getSize() override;
  void scale(float x, float y) override;
 
- bool clickListener(GameEvents &gameEvents, sf::Vector2f &clickedPos);
+ bool clickListener(sf::Vector2f &clickedPos);
  sf::Color getPixelColor(sf::Vector2f pos);
  void setColorBox(std::string picPath, std::string borderPath);
  void setColorImage(std::string picPath);

src/include/UIElements/UIElement.hpp

@@ -5,7 +5,7 @@
 
 class UIElement {
  public:
- virtual void draw(sf::RenderWindow* window);
+ virtual void draw();
  virtual void setPosition(float x, float y);
  virtual sf::Vector2f getPosition();
  virtual sf::FloatRect getSize();

src/include/UIElements/UIStats.hpp

@@ -9,10 +9,10 @@
 
 class UIStats: public UIElement {
  public:
- UIStats(Game &game, Actor actor);
+ UIStats(Actor actor);
 
  void setActor(Actor actor);
- void draw(sf::RenderWindow* gameWindow) override;
+ void draw() override;
  sf::Vector2f getPosition() override;
  void setPosition(float x, float y) override;
  sf::FloatRect getSize() override;

src/include/UIObjects/UIEnemyOverview.hpp

@@ -13,8 +13,8 @@
 
 class UIEnemyOverview {
  public:
- UIEnemyOverview(Game &game, Enemy enemy);
- UIEnemyOverview(Game &game);
+ UIEnemyOverview(Enemy enemy);
+ UIEnemyOverview();
 
  Enemy creature;
  UIColorPicker colorPicker = UIColorPicker("colorPIC_default.png", "color_picker_border.png");
@@ -23,7 +23,7 @@ class UIEnemyOverview {
  void setEnemy(Enemy enemy);
  void changeHealth(int value);
  void updatePickedColorText(std::string newText, sf::Color pickedColor);
- void draw(sf::RenderWindow* gameWindow);
+ void draw();
 
  private:
  UIBox backgroundBox = UIBox(sf::Color(51, 25, 0, 150), "borders/metal_border_900x900.png");

src/include/UIObjects/UIPlayerOverview.hpp

@@ -12,13 +12,13 @@
 
 class UIPlayerOverview {
  public:
- UIPlayerOverview(Game &game);
+ UIPlayerOverview();
 
  UIBorderedImage playerFrame;
  Player player;
 
  void changeHealth(int value);
- void draw(sf::RenderWindow* gameWindow);
+ void draw();
 
  private:
  UIBox backgroundBox = UIBox(sf::Color(51, 25, 0, 150), "borders/metal_border_900x900.png");

src/main/Activities/Activity.cpp

@@ -1,14 +1,15 @@
 #include "Activities/Activity.hpp"
 
-Activity::Activity(Game &game) {
- sf::Vector2u windowSize = game.renderEngine.gameWindow->getSize();
+Activity::Activity() {
+ Game game = Game::getInstance();
+ sf::Vector2u windowSize = game.gameWindow.getSize();
  sf::FloatRect buttonSize = this->exitButton.getSize();
  this->exitButton.setPosition(windowSize.x * 0.99 - buttonSize.width, windowSize.x * 0.01);
 }
 
 Activity::~Activity() {
 }
 
-ActivityEnum Activity::executeActivity(Game &game) {
+ActivityEnum Activity::executeActivity() {
  return ActivityEnum::Menu;
 }

src/main/Activities/CharacterActivity.cpp

@@ -1,17 +1,16 @@
 #include "Activities/CharacterActivity.hpp"
 
-CharacterActivity::CharacterActivity(Game &game): Activity(game) {
+CharacterActivity::CharacterActivity(): Activity() {
  this->backgroundTX.loadFromFile(RESOURCE_PATH "backgrounds/backgroundMenu.png");
  this->backgroundSP.setTexture(this->backgroundTX);
 }
 
-ActivityEnum CharacterActivity::executeActivity(Game &game) {
+ActivityEnum CharacterActivity::executeActivity() {
+ Game game = Game::getInstance();
  ActivityEnum currentActivity = ActivityEnum::Character;
-
- sf::RenderWindow *gameWindow = game.renderEngine.gameWindow;
- gameWindow->draw(this->backgroundSP);
- this->exitButton.draw(gameWindow);
- if (this->exitButton.clickListener(gameWindow, game.gameEvents)) {
+ game.gameWindow.draw(this->backgroundSP);
+ this->exitButton.draw();
+ if (this->exitButton.clickListener()) {
  currentActivity = ActivityEnum::Menu;
  }
  return currentActivity;