refactor: continued implementing observer

src/include/Actors/Actor.hpp

@@ -5,7 +5,6 @@
 #include <list>
 
 #include "ObserverPattern/Observer.hpp"
-#include "ObserverPattern/Subject.hpp"
 
 struct RGB {
  int red = 0;

src/include/FightEnv.hpp

@@ -15,7 +15,7 @@ class FightEnv {
 
  sf::Texture backgroundTX;
  sf::Sprite backgroundSP;
- UIStats playerStatsBox;
+ //UIStats playerStatsBox;
  UIEnemyOverview enemyOverview;
  UIPlayerOverview playerOverview;
  TextFadingManager textFadingManager;

src/include/ObserverPattern/Observer.hpp

@@ -1,15 +1,31 @@
 #ifndef OBSERVER_HPP
 #define OBSERVER_HPP
 
-class Actor;
+#include <list>
+#include <iostream>
+
+class Subject;
 
 class Observer {
  public:
- Observer(Actor& subject);
+ Observer();
+ //Observer(Actor& subject);
  virtual ~Observer();
  virtual void onNotify(int newValue);
  private:
- Actor& subject;
+ Subject* subject;
+};
+
+class Subject {
+ public:
+ void attachObserver(Observer& observer);
+ void detachObserver(Observer& observer);
+
+ private:
+ std::list<Observer> observers;
+
+ protected:
+ virtual void notify(int newValue);
 };
 
 #endif

src/include/ObserverPattern/Subject.hpp

@@ -1,20 +1,8 @@
 #ifndef SUBJECT_HPP
 #define SUBJECT_HPP
 
-#include <list>
-
 #include "ObserverPattern/Observer.hpp"
 
-class Subject {
- public:
- void attachObserver(Observer& observer);
- void detachObserver(Observer& observer);
-
- private:
- std::list<Observer> observers;
 
- protected:
- virtual void notify(int newValue);
-};
 
 #endif

src/include/UIElements/UIStats.hpp

@@ -11,6 +11,8 @@
 
 class UIStats: public UIElement, Observer {
  public:
+ UIStats();
+ ~UIStats();
  void init(Actor actor);
  void draw() override;
  sf::Vector2f getPosition() override;

src/include/UIObjects/UIPlayerOverview.hpp

@@ -11,7 +11,9 @@
 
 class UIPlayerOverview {
  public:
- UIBorderedImage playerFrame;
+ UIPlayerOverview() {}
+
+ UIBorderedImage playerFrame;
  Player player;
 
  void init();

src/main/Activities/FightActivity.cpp

@@ -19,8 +19,8 @@ FightActivity::FightActivity() : Activity(), fightEnv(), currentFightState(std::
  sf::Vector2f backgroundScale = sf::Vector2f(windowSize.x / backgroundSize.x, windowSize.y / backgroundSize.y);
  this->fightEnv.backgroundSP.scale(backgroundScale);
 
- float relativeOuterPaddingStatBoxes = 0.02;
- this->fightEnv.playerStatsBox.setPosition(windowSize.x * relativeOuterPaddingStatBoxes, (windowSize.y - this->fightEnv.playerStatsBox.getSize().height)/2);
+ //float relativeOuterPaddingStatBoxes = 0.02;
+ //this->fightEnv.playerStatsBox.setPosition(windowSize.x * relativeOuterPaddingStatBoxes, (windowSize.y - this->fightEnv.playerStatsBox.getSize().height)/2);
 
  std::random_device randSeed;
  std::mt19937 gen(randSeed());

src/main/Actors/Actor.cpp

@@ -3,10 +3,7 @@
 Actor::Actor() {}
 
 
-Observer::Observer(Actor& subject_): subject(subject_) {
+/*Observer::Observer(Actor& subject_): subject(subject_) {
  this->subject.attachObserver(*this);
 }
-
-Observer::~Observer() {
- this->subject.detachObserver(*this);
-}
+*/

src/main/FightEnv.cpp

@@ -1,5 +1,5 @@
 #include "FightEnv.hpp"
 
 FightEnv::FightEnv() {
- playerStatsBox.init(Game::getInstance().player);
+ //playerStatsBox.init(Game::getInstance().player);
 }

src/main/ObserverPattern/Observer.cpp

@@ -2,4 +2,30 @@
 
 //constructor and destructor defined in ObserverPattern/Subject.cpp
 
-void Observer::onNotify(int newValue) {}
+Observer::Observer() {
+ std::cout << "Observer" << std::endl;
+}
+
+Observer::~Observer() {
+ std::cout << "~Observer" << std::endl;
+ this->subject->detachObserver(*this);
+}
+
+void Observer::onNotify(int newValue) {}
+
+void Subject::notify(int newValue) {
+ for (Observer obs: observers) {
+ obs.onNotify(newValue);
+ }
+}
+
+void Subject::attachObserver(Observer &observer) {
+ this->observers.push_front(observer);
+}
+
+void Subject::detachObserver(Observer &observer) {
+ std::cout << "Size: " << this->observers.size() << std::endl;
+ this->observers.remove_if([&observer] (const Observer obs) {
+ return &obs == &observer;
+ });
+}

src/main/ObserverPattern/Subject.cpp

@@ -1,17 +1,2 @@
 #include "ObserverPattern/Subject.hpp"
 
-void Subject::notify(int newValue) {
- for (Observer obs: observers) {
- obs.onNotify(newValue);
- }
-}
-
-void Subject::attachObserver(Observer &observer) {
- this->observers.push_front(observer);
-}
-
-void Subject::detachObserver(Observer &observer) {
- this->observers.remove_if([&observer] (const Observer obs) {
- return &obs == &observer;
- });
-}

src/main/UIElements/UIStats.cpp

@@ -1,5 +1,10 @@
 #include "UIElements/UIStats.hpp"
 
+UIStats::UIStats() {
+}
+
+UIStats::~UIStats() {
+}
 
 void UIStats::init(Actor actor) {
  actor.attachObserver(*this);
@@ -79,7 +84,6 @@ void UIStats::setPosition(float x, float y) {
  float statsSeparationPaddingY = actorStatsBoxSize.height * 0.05;
 
  std::string currentActor = this->actorName.getString();
- std::cout << currentActor << std::endl;
  sf::FloatRect actorNameRec = this->actorName.getGlobalBounds();
  this->actorName.setPosition(x + ((actorStatsBoxSize.width - actorNameRec.width)/2), y + actorStatsBoxSize.height * 0.15);
  this->actorHealthLabel.setPosition(statsLabelPosX, y + statsOffsetY);