ActionScene changes

Added drawBackground and drawForeground
- background for handling parallax scrolling during levels
- foreground for HUD implementation

6 files changed, 25 insertions, 57 deletions

diff --git a/src/ActionScene.cpp b/src/ActionScene.cpp
index cc6faa4..8799e3e 100644
--- a/src/ActionScene.cpp
+++ b/src/ActionScene.cpp
@@ -103,6 +103,11 @@ void ActionScene::keyPressEvent(QKeyEvent *event)
     }
 }
 
+void ActionScene::drawForeground(QPainter *painter, const QRectF &rect)
+{
+
+}
+
 void ActionScene::loadMap(QString target)
 {
     QFileInfo f(target);
diff --git a/src/ActionScene.h b/src/ActionScene.h
index 28d032b..6daa42a 100644
--- a/src/ActionScene.h
+++ b/src/ActionScene.h
@@ -27,6 +27,16 @@ public:
     void keyPressEvent(QKeyEvent *event);
 
     /**
+      * TODO: Bind in-game background parallax-scroller to this
+      */
+    void drawBackground(QPainter *painter, const QRectF &rect);
+
+    /**
+      * Used to draw HUD, TODO: implementation
+      */
+    void drawForeground(QPainter *painter, const QRectF &rect);
+
+    /**
       * Loads level from target location.
       */
     void loadMap(QString target);
@@ -48,12 +58,6 @@ private:
     //! Levelscore used for records.
     int m_levelScore;
 
-    //! Map layer is drawn to this pixmap
-    //QPixmap m_mapPixmap;
-
-    //! Item for map layer
-    //QGraphicsPixmapItem *m_mapPixmapItem;
-
     //! Map layers are drawn to these pixmaps
     QVector<QPixmap> m_mapPixmaps;
 
diff --git a/src/BarDisplay.cpp b/src/BarDisplay.cpp
index edab1c9..db6136d 100644
--- a/src/BarDisplay.cpp
+++ b/src/BarDisplay.cpp
@@ -1,7 +1,7 @@
 #include "BarDisplay.h"
 
-BarDisplay::BarDisplay(QGraphicsItem* parent) :
-    QGraphicsItem(parent)
+BarDisplay::BarDisplay() :
+    QPixmap()
 {
     m_partCount = 4;
     m_maxValue = 50;
@@ -47,12 +47,3 @@ void BarDisplay::updateDisplay()
 {
     // TODO: update graphics so user knows he is hit
 }
-
-QRectF BarDisplay::boundingRect() const
-{
-    return QRectF();
-}
-
-void BarDisplay::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
-{
-}
diff --git a/src/BarDisplay.h b/src/BarDisplay.h
index 4980f8b..c08f9c2 100644
--- a/src/BarDisplay.h
+++ b/src/BarDisplay.h
@@ -1,17 +1,14 @@
 #ifndef BarDisplay_h
 #define BarDisplay_h
 
-#include <QGraphicsItem>
+#include <QPixmap>
 
-class BarDisplay : public QGraphicsItem
+class BarDisplay : public QPixmap
 {
 public:
-    BarDisplay(QGraphicsItem* parent = 0);
+    BarDisplay();
     virtual ~BarDisplay();
 
-    virtual QRectF boundingRect() const;
-    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
-
     void collected(int);
     void consumed(int);
     void setDisplayColor(QColor col);
diff --git a/src/CircularDisplay.cpp b/src/CircularDisplay.cpp
index a1a16f3..2c723c3 100644
--- a/src/CircularDisplay.cpp
+++ b/src/CircularDisplay.cpp
@@ -1,7 +1,7 @@
 #include "CircularDisplay.h"
 
-CircularDisplay::CircularDisplay(QGraphicsItem* parent) :
-    QGraphicsItem(parent)
+CircularDisplay::CircularDisplay() :
+    QPixmap()
 {
     m_partCount = 5;
     m_maxValue = 50;
@@ -19,21 +19,6 @@ CircularDisplay::~CircularDisplay()
 {
 }
 
-void CircularDisplay::advance(int phase)
-{
-    if (phase == 0)
-        return;
-
-    // TODO: consuming logic if color is activated
-    if (phase == 1)
-    {
-        if (m_activated)
-            ;
-        else
-            return;
-    }
-}
-
 void CircularDisplay::setDisplayColor(QColor col)
 {
     m_displayColor = col;
@@ -62,12 +47,3 @@ void CircularDisplay::updateDisplay()
 {
     // TODO: update graphics so user knows collecting stuff does help
 }
-
-QRectF CircularDisplay::boundingRect() const
-{
-    return QRectF();
-}
-
-void CircularDisplay::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
-{
-}
diff --git a/src/CircularDisplay.h b/src/CircularDisplay.h
index 6889645..557ef14 100644
--- a/src/CircularDisplay.h
+++ b/src/CircularDisplay.h
@@ -1,19 +1,14 @@
 #ifndef CircularDisplay_h
 #define CircularDisplay_h
 
-#include <QGraphicsItem>
+#include <QPixmap>
 
-class CircularDisplay : public QGraphicsItem
+class CircularDisplay : public QPixmap
 {
 public:
-    CircularDisplay(QGraphicsItem* parent = 0);
+    CircularDisplay();
     virtual ~CircularDisplay();
 
-    virtual QRectF boundingRect() const;
-    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
-
-    void advance(int phase);
-
     void setDisplayColor(QColor col);
     void collected(int amount);
     void activate();