composite . it does not work

Author: dpinol

Game.cpp

@@ -14,7 +14,7 @@
 #include "SoundManager.h"
 #include "GameOverState.h"
 
-#include <utils/Effect.h>
+#include <utils/ValueEffect.h>
 #include <iostream>
 
 using namespace std;

GameObject.cpp

@@ -0,0 +1,36 @@
+/**************************************************************************
+** Qt Creator license header template
+**   Special keywords: dpinol 08/03/2014 2014
+**   Environment variables:
+**   To protect a percent sign, use '%'.
+**************************************************************************/
+#include "GameObject.h"
+#include <utils/Effect.h>
+
+GameObject::GameObject() :  m_pixel(0,0),
+  m_velocity(0,0),
+  m_acceleration(0,0),
+  m_width(0),
+  m_height(0),
+  m_currentRow(0),
+  m_currentFrame(0),
+  m_bUpdating(false),
+  m_bDead(false),
+  m_bDying(false),
+  m_dyingTime(0),
+  m_dyingCounter(0),
+  m_angle(0),
+  m_alpha(255),
+  m_effects(new dani::CompositeEffect)
+{
+}
+
+GameObject::~GameObject()
+{
+
+}
+
+void GameObject::update()
+{
+  m_effects->update();
+}

GameObject.h

@@ -17,22 +17,26 @@
 #include <memory>
 #include <vector>
 
+namespace dani
+{
+  class CompositeEffect;
+}
 
 class GameObject
 {
 public:
 
     // base class needs virtual destructor
-    virtual ~GameObject() {}
+    virtual ~GameObject();
 
     // load from file - int x, int y, int width, int height, std::string textureID, int numFrames, int callbackID = 0, int animSpeed = 0
     virtual void load(std::unique_ptr<LoaderParams> const &pParams) = 0;
 
     // draw the object
     virtual void draw() = 0;
 
-    // do update stuf
-    virtual void update() = 0;
+    // do update stuff
+    virtual void update();
 
     // remove anything that needs to be deleted
     virtual void clean() = 0;
@@ -75,22 +79,7 @@ class GameObject
 protected:
 
     // constructor with default initialisation list
-    GameObject() :  m_pixel(0,0),
-                    m_velocity(0,0),
-                    m_acceleration(0,0),
-                    m_width(0),
-                    m_height(0),
-                    m_currentRow(0),
-                    m_currentFrame(0),
-                    m_bUpdating(false),
-                    m_bDead(false),
-                    m_bDying(false),
-                    m_dyingTime(0),
-                    m_dyingCounter(0),
-                    m_angle(0),
-                    m_alpha(255)
-    {
-    }
+    GameObject() ;
 
     // movement variables
     Vector2D m_pixel;
@@ -120,6 +109,7 @@ class GameObject
 
     // blending
     int m_alpha;
+    std::unique_ptr<dani::CompositeEffect> m_effects;
 
 };
 

GameState.cpp

@@ -7,6 +7,25 @@
 
 #include "GameState.h"
 #include "GameObject.h"
+#include <utils/Effect.h>
+
+GameState::GameState()
+  : m_loadingComplete(false),
+    m_exiting(false),
+    m_effects(new dani::CompositeEffect)
+{
+
+}
+
+GameState::~GameState()
+{
+
+}
+
+void GameState::resume()
+{
+
+}
 
 bool GameState::onEnter()
 {
@@ -19,21 +38,22 @@ void GameState::render()
 {
   if(m_loadingComplete)
   {
-      for(int i = 0; i < m_gameObjects.size(); i++)
-      {
-          m_gameObjects[i]->draw();
-      }
+    for(GameObject * o: m_gameObjects)
+    {
+      o->draw();
+    }
   }
 }
 
 void GameState::update()
 {
   if(m_loadingComplete)
   {
-      for(int i = 0; i < m_gameObjects.size(); i++)
-      {
-          m_gameObjects[i]->update();
-      }
+    m_effects->update();
+    for(GameObject * o: m_gameObjects)
+    {
+      o->update();
+    }
   }
 }
 

GameState.h

@@ -9,39 +9,42 @@
 #ifndef SDL_Game_Programming_Book_IGameState_h
 #define SDL_Game_Programming_Book_IGameState_h
 
+
 #include <string>
 #include <vector>
+#include <memory>
+
+namespace dani
+{
+  class CompositeEffect;
+}
 
 class GameObject;
 class GameState
 {
 public:
-    
-    virtual ~GameState() {}
+    virtual ~GameState();
 
     virtual void update();
     virtual void render();
 
     virtual bool onEnter();
     virtual bool onExit() = 0;
 
-    virtual void resume() {}
+    virtual void resume();
 
     virtual std::string getStateID() const = 0;
 
 protected:
     virtual bool onEnterImpl() = 0;
 
-    GameState() : m_loadingComplete(false), m_exiting(false)
-    {
-        
-    }
-    
+    GameState();
+    //@todo put everything on pimpl
     bool m_loadingComplete;
     bool m_exiting;
     std::vector<GameObject*> m_gameObjects;
-
     std::vector<std::string> m_textureIDList;
+    std::unique_ptr<dani::CompositeEffect> m_effects;
 };
 
 #endif

JewelObject.h

@@ -11,7 +11,7 @@
 
 #include <SDL.h>
 #include "BoardObject.h"
-#include <utils/Effect.h>
+#include <utils/ValueEffect.h>
 #include "model/Jewel.h"
 #include "JewelMove.h"
 #include <SDL_timer.h>

MovingObject.cpp

@@ -10,6 +10,7 @@
 #include "TextureManager.h"
 #include "Game.h"
 #include <utils/utils.h>
+#include <utils/Effect.h>
 
 #include <numeric>
 #include <SDL2/SDL_render.h>
@@ -24,6 +25,8 @@ MovingObject::MovingObject(const std::string &imgFilename, int totalTimeMs, bool
     m_angle(0),
     m_trajectoryIndex(0)
 {
+  m_effects->addChild(m_alpha);
+  m_effects->addChild(m_scale);
   TheTextureManager::Instance()->load(imgFilename, "spark");
   int access;
   Uint32 format;
@@ -111,6 +114,7 @@ void MovingObject::update()
 {
   if (m_done)
     return;
+  m_effects->update();
   float dist = (m_pixel - m_trajectory[m_trajectoryIndex]).length();
   if (dist < 2)
   {

MovingObject.h

@@ -11,7 +11,7 @@
 #include "GameObject.h"
 #include <vector>
 #include <utils/Vector2D.h>
-#include <utils/Effect.h>
+#include <utils/ValueEffect.h>
 #include <memory>
 
 class MovingObject : public GameObject

SDL_test.pro

@@ -12,7 +12,8 @@ SOURCES += *.cpp \
     model/test/*.cpp \
     utils/init.cpp \
     MovingObject.cpp \
-    utils/Disturber.cpp
+    utils/Disturber.cpp \
+    GameObject.cpp
 
 
 OTHER_FILES += \

utils/Effect.cpp

@@ -8,6 +8,7 @@
 #include "Effect.h"
 #include <utils/utils.h>
 #include <stdexcept>
+#include <numeric>
 
 namespace dani
 {
@@ -84,9 +85,24 @@ namespace dani
     }
   }
 
-  void CompositeEffect::addChid(std::unique_ptr<Effect> child)
+  void CompositeEffect::addChild(Effect &child)
   {
-    m_children.push_back(std::move(child));
+    m_children.push_back(&child);
+  }
+
+  bool CompositeEffect::isDone() const
+  {
+    return !std::all_of(m_children.begin(), m_children.end(),
+                        [](Effect* e)
+    {return e->isDone();});
+  }
+
+  void CompositeEffect::restart()
+  {
+    for(auto &effect: m_children)
+    {
+      effect->restart();
+    }
   }
 
 }

utils/Effect.h

@@ -73,11 +73,18 @@ namespace dani
 
   class CompositeEffect: public Effect
   {
-    void addChid(std::unique_ptr<Effect>);
+  public:
+    /**
+     * @brief addChid
+     * @param effect ownwership is not transferred
+     */
+    void addChild(Effect &effect);
     virtual void update() override;
     virtual void setPaused(bool paused = true) override;
+    virtual bool isDone() const override;
+    virtual void restart() override;
   private:
-    std::vector<std::unique_ptr<Effect>> m_children;
+    std::vector<Effect*> m_children;
   };
 }
 #endif // Effect_H

utils/ValueEffect.h

@@ -20,6 +20,7 @@ namespace dani
   template <class T>
   class ValueEffect : public Effect
   {
+  public:
     inline T const &get() const
     {
       return m_value;
@@ -67,6 +68,7 @@ namespace dani
       m_maxDisturbance = maxDisturbance;
     }
 
+
     void setRange(T const &min, T const &max)
     {
       m_mean = (min + max) / 2.0;
@@ -78,7 +80,7 @@ namespace dani
     T m_maxDisturbance;
     //cache so that we can return by ref
     //T m_lastValue;
-  };
+  }; //RangeEffect
 
 
   template <class T>
@@ -87,6 +89,10 @@ namespace dani
     typedef RangeEffect<T> Parent;
   public:
 
+    void restart() override
+    {
+    }
+
     constexpr bool isDone() const override
     {
       return false;
@@ -107,6 +113,7 @@ namespace dani
   {
     typedef RangeEffect<T> Parent;
     //int m_periodMs;
+    float m_startRadian;
     mutable float m_curRadian;
     //larger than 10 for non stop
     float m_stopRadian;
@@ -115,6 +122,7 @@ namespace dani
     OscilleEffect()
     {
       setPeriod();
+      m_startRadian = 0;
       m_curRadian = 0;
       m_stopRadian = 42;
     }
@@ -135,6 +143,11 @@ namespace dani
       return m_curRadian > m_stopRadian;
     }
 
+    void restart()
+    {
+      m_curRadian = m_startRadian;
+    }
+
 
     /**
      * @brief setStartPhase