effects chained. does not display effects

Author: dpinol

JewelBoard.cpp

@@ -76,6 +76,16 @@ inline static void assertBoardPos(BoardPos const pos)
 }
 #endif
 
+Board const &JewelBoard::getModel() const
+{
+  return m_model;
+}
+
+Board &JewelBoard::getModel()
+{
+  return m_model;
+}
+
 JewelObject& JewelBoard::getJewel(BoardPos const pos)
 {
   assertBoardPos(pos);
@@ -116,13 +126,22 @@ BoardPos JewelBoard::getJewelAt(Vector2D const &v) const
                   (v.getY() - m_offset.getY()) / JewelObject::HEIGHT);
 }
 
+/**
+ * @brief wa swaps jewels at specified positions
+ * but only if final position achieves a strike
+ * @param pos1
+ * @param pos2
+ * @return whether they could be swap
+
+bool swap(BoardPos const pos1, BoardPos const pos2);
+
 bool JewelBoard::swap(BoardPos const pos1, BoardPos const pos2)
 {
   JewelSwap sw(m_model);
   sw.setPositions(pos1, pos2);
   return sw.run();
 }
-
+*/
 void JewelBoard::pureSwap(BoardPos pos, BoardPos pos2)
 {
   /*getJewel(BoardPos(pos.m_col, pos.m_row + 1)) = jo;

JewelBoard.h

@@ -37,16 +37,8 @@ class JewelBoard : public BoardObject, BoardCallback
     //BoardCallback
     void kill(BoardPos pos) override;
     bool isAlive(BoardPos pos) const override;
+    //
 
-
-    /**
-     * @brief swap swaps jewels at specified positions
-     * but only if final position achieves a strike
-     * @param pos1
-     * @param pos2
-     * @return whether they could be swap
-     */
-    bool swap(BoardPos const pos1, BoardPos const pos2);
     /**
      * @brief getJewel
      * @param row 0 to SIZE
@@ -86,6 +78,9 @@ class JewelBoard : public BoardObject, BoardCallback
     BoardPos getJewelAt(const Vector2D &pixel) const;
     Vector2D getJewelPixel(BoardPos pos) const;
 
+    Board &getModel();
+    Board const &getModel() const;
+
 private:
     /**
      * Just swap the 2 pointers to the Jewels

JewelDrag.cpp

@@ -9,10 +9,13 @@
 #include "JewelObject.h"
 #include "JewelBoard.h"
 #include <utils/log.h>
+#include <utils/Effect.h>
 #include "InputHandler.h"
 
 JewelDrag::JewelDrag(JewelBoard &board)
-  :m_board(board)
+  :m_board(board),
+    m_modelSwap(board.getModel()),
+    m_swapEffect(NULL)
 {
 }
 
@@ -42,13 +45,13 @@ void JewelDrag::drag()
     BoardPos shiftPos;
     int RATIO = 3;
     if (shift.getX() > JewelObject::WIDTH / RATIO)
-        shiftPos = BoardPos(1,0);
+      shiftPos = BoardPos(1,0);
     else if (shift.getX() < -JewelObject::WIDTH / RATIO)
-        shiftPos = BoardPos(-1,0);
+      shiftPos = BoardPos(-1,0);
     else if (shift.getY() > JewelObject::HEIGHT / RATIO)
-        shiftPos = BoardPos(0, 1);
+      shiftPos = BoardPos(0, 1);
     else if (shift.getY() < -JewelObject::HEIGHT / RATIO)
-        shiftPos = BoardPos(0, -1);
+      shiftPos = BoardPos(0, -1);
     else
     {
       LOG_DEBUG("shift too small: " << shift);
@@ -59,9 +62,16 @@ void JewelDrag::drag()
     bool returnBack;
     if (m_toPos.isValid())
     {
-      returnBack = !m_board.swap(m_fromPos, m_toPos);
+      m_modelSwap.setPositions(m_fromPos, m_toPos);
+      returnBack = m_modelSwap.isValid();
+
       m_board.getJewel(m_fromPos).swapWith(shiftPos, returnBack);
-      m_board.getJewel(m_toPos).swapWith(-shiftPos, returnBack);
+      m_swapEffect = &m_board.getJewel(m_toPos).swapWith(-shiftPos, returnBack);
+      m_swapEffect->setNext([&]()
+      {
+        m_modelSwap.run();
+        m_swapEffect->setNext(NULL);
+      });
     }
     else
       LOG_DEBUG("to_pos not valid: " << m_toPos);

JewelDrag.h

@@ -10,8 +10,13 @@
 
 #include <utils/Vector2D.h>
 #include <model/BoardPos.h>
+#include <model/JewelSwap.h>
+
 
 class JewelBoard;
+namespace dani {
+  class Effect;
+}
 
 /**
  * @brief The JewelDrag class mimicks Candy Crush swipe.
@@ -35,6 +40,8 @@ class JewelDrag
   /** redundant wrt m_fromPixel to avoid recalculation*/
   BoardPos m_fromPos;
   BoardPos m_toPos;
+  JewelSwap m_modelSwap;
+  dani::Effect *m_swapEffect;
 //  BoardPos m_selected;
 
 };

JewelObject.cpp

@@ -7,16 +7,19 @@
 //
 
 #include "JewelObject.h"
-
 #include "TextureManager.h"
 #include "Game.h"
+#include <utils/ValueEffect.h>
 
 const short JewelObject::FALLING_STEPS = 20;
 
 JewelObject::JewelObject(Jewel &jewel, bool firstRow) :
   m_model(&jewel),
   m_fallingStep(0)
 {
+  m_effects->addChild(m_swapper);
+  m_effects->addChild(m_dier);
+
   m_swapper.setPeriod(3000);
   m_swapper.setPaused(true);
   m_dier.setPaused(true);
@@ -40,7 +43,7 @@ Jewel& JewelObject::getModel()
   return *m_model;
 }
 
-void JewelObject::swapWith(BoardPos relativeShift, bool andReturn)
+dani::Effect &JewelObject::swapWith(BoardPos relativeShift, bool andReturn)
 {
   m_swapper.setPaused(false);
   Vector2D vShift(relativeShift.m_col * WIDTH, relativeShift.m_row * HEIGHT);
@@ -54,6 +57,7 @@ void JewelObject::swapWith(BoardPos relativeShift, bool andReturn)
   {
     m_swapper.setStopPhase(M_PI / 2);
   }
+  return m_swapper;
 }
 
 
@@ -96,6 +100,7 @@ void JewelObject::draw()
 // apply velocity to current position
 void JewelObject::update()
 {
+  m_effects->update();
   if (isDying())
   {
     m_dyingCounter++;

JewelObject.h

@@ -53,7 +53,7 @@ class JewelObject : public BoardObject
   void setFalling(bool falling =true);
   void fallStep();
 
-  void swapWith(BoardPos relativeShift, bool andReturn);
+  dani::Effect &swapWith(BoardPos relativeShift, bool andReturn);
 
   static constexpr short WIDTH = 35;
   static constexpr short HEIGHT = 35;

MovingObject.cpp

@@ -52,15 +52,13 @@ MovingObject::~MovingObject()
 void MovingObject::setRandomSize(float amplitudeRatio)
 {
   m_scale.setMean(1, amplitudeRatio);
-  m_scale.setPaused();
 }
 
 void MovingObject::setAlphaOscillation(float minAlphaRatio)
 {
   //m_minAlphaPerc = minAlphaRatio;
   //m_alphaDegree = 0;
   m_alpha.setRange( 255 *  minAlphaRatio, 255);
-  m_alpha.setPaused();
 }
 
 void MovingObject::setTrajectory(Trajectory &trajectory)

utils/Effect.cpp

@@ -15,11 +15,46 @@ namespace dani
 
   Effect::Effect(bool paused)
     :m_paused(paused),
+      m_isDone(false),
       m_slave(NULL),
-      m_next(NULL)
+      m_next(NULL),
+      m_callback(NULL)
   {
   }
+#if 0
+  /**
+   * @brief restart
+   * resets m_isDone and calls restartImpl
+   */
+  void restart();
+
+  void Effect::restart()
+  {
+    m_isDone = false;
+    restartImpl();
+  }
+#endif
 
+  void Effect::update()
+  {
+    if (isDone())
+    {
+      if (!m_isDone)
+      {
+        if (m_next)
+          m_next->setPaused(false);
+        if (m_callback)
+          m_callback();
+        m_isDone = true;
+      }
+    }
+    else
+    {
+      m_isDone = false;
+      if (!isPaused())
+        updateImpl();
+    }
+  }
 
   void Effect::setSlave(Effect *slaveEffect)
   {
@@ -31,6 +66,11 @@ namespace dani
     m_next = nextEffect;
   }
 
+  void Effect::setNext(std::function<void (void)> callback)
+  {
+    m_callback = callback;
+  }
+
   void Effect::setFPS(int FPS)
   {
     m_FPS = FPS;
@@ -69,7 +109,7 @@ namespace dani
   }
 
   /******** Composite Effect****/
-  void CompositeEffect::update()
+  void CompositeEffect::updateImpl()
   {
     for(auto &effect: m_children)
     {
@@ -85,6 +125,11 @@ namespace dani
     }
   }
 
+  void CompositeEffect::clearChildren()
+  {
+    m_children.clear();
+  }
+
   void CompositeEffect::addChild(Effect &child)
   {
     m_children.push_back(&child);
@@ -97,12 +142,12 @@ namespace dani
     {return e->isDone();});
   }
 
-  void CompositeEffect::restart()
+/*  void CompositeEffect::restartImpl()
   {
     for(auto &effect: m_children)
     {
       effect->restart();
     }
   }
-
+*/
 }