extreme cleanup

6 files changed, 62 insertions, 286 deletions

diff --git a/pacman-c++/actor.cpp b/pacman-c++/actor.cpp
new file mode 100644
index 0000000..860f490
--- /dev/null
+++ b/pacman-c++/actor.cpp
@@ -0,0 +1,7 @@
+#include "actor.h"
+
+Actor::Actor(Type type)
+    : PixmapItem("google-pacman-sprite"), m_type(type), m_direction(Actor::None)
+{
+    setSprite(2, 2, 16, 16);
+}
diff --git a/pacman-c++/actor.h b/pacman-c++/actor.h
new file mode 100644
index 0000000..753c920
--- /dev/null
+++ b/pacman-c++/actor.h
@@ -0,0 +1,30 @@
+#ifndef ACTOR_H
+#define ACTOR_H
+
+#include "pixmapitem.h"
+
+class Actor
+    : public PixmapItem
+{
+public:
+    enum Movement {
+        None = 0,
+        Left,
+        Right,
+        Up,
+        Down
+    };
+
+    enum Type {
+        Player1 = 1,
+        Player2,
+        Player3,
+    };
+
+    Actor(Type type);
+private:
+    Type m_type;
+    Movement m_direction;
+};
+
+#endif // ACTOR_H
diff --git a/pacman-c++/main.cpp b/pacman-c++/main.cpp
index 5fa9c1c..ac55036 100644
--- a/pacman-c++/main.cpp
+++ b/pacman-c++/main.cpp
@@ -1,286 +1,23 @@
+#include "actor.h"
 #include "pixmapitem.h"
 #include <QtCore>
 #include <QtGui>
 
-//![15]
-class StateSwitchEvent: public QEvent
-{
-public:
-    StateSwitchEvent()
-        : QEvent(Type(StateSwitchType))
-    {
-    }
-
-    StateSwitchEvent(int rand)
-        : QEvent(Type(StateSwitchType)),
-          m_rand(rand)
-    {
-    }
-
-    enum { StateSwitchType = QEvent::User + 256 };
-
-    int rand() const { return m_rand; }
-
-private:
-    int m_rand;
-};
-//![15]
-
-//![16]
-class QGraphicsRectWidget : public QGraphicsWidget
-{
-public:
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *,
-               QWidget *)
-    {
-        painter->fillRect(rect(), Qt::blue);
-    }
-};
-//![16]
-
-class StateSwitchTransition: public QAbstractTransition
-{
-public:
-    StateSwitchTransition(int rand)
-        : QAbstractTransition(),
-          m_rand(rand)
-    {
-    }
-
-protected:
-//![14]
-    virtual bool eventTest(QEvent *event)
-    {
-        return (event->type() == QEvent::Type(StateSwitchEvent::StateSwitchType))
-            && (static_cast<StateSwitchEvent *>(event)->rand() == m_rand);
-    }
-//![14]
-
-    virtual void onTransition(QEvent *) {}
-
-private:
-    int m_rand;
-};
-
-//![10]
-class StateSwitcher : public QState
-{
-    Q_OBJECT
-public:
-    StateSwitcher(QStateMachine *machine)
-        : QState(machine), m_stateCount(0), m_lastIndex(0)
-    { }
-//![10]
-
-//![11]
-    virtual void onEntry(QEvent *)
-    {
-        int n;
-        while ((n = (qrand() % m_stateCount + 1)) == m_lastIndex)
-        { }
-        m_lastIndex = n;
-        machine()->postEvent(new StateSwitchEvent(n));
-    }
-    virtual void onExit(QEvent *) {}
-//![11]
-
-//![12]
-    void addState(QState *state, QAbstractAnimation *animation) {
-        StateSwitchTransition *trans = new StateSwitchTransition(++m_stateCount);
-        trans->setTargetState(state);
-        addTransition(trans);
-        trans->addAnimation(animation);
-    }
-//![12]
-
-private:
-    int m_stateCount;
-    int m_lastIndex;
-};
-
-//![13]
-QState *createGeometryState(QObject *w1, const QRect &rect1,
-                            QObject *w2, const QRect &rect2,
-                            QObject *w3, const QRect &rect3,
-                            QObject *w4, const QRect &rect4,
-                            QState *parent)
-{
-    QState *result = new QState(parent);
-    result->assignProperty(w1, "geometry", rect1);
-    result->assignProperty(w2, "geometry", rect2);
-    result->assignProperty(w3, "geometry", rect3);
-    result->assignProperty(w4, "geometry", rect4);
-
-    return result;
-}
-//![13]
-
 int main(int argc, char **argv)
 {
     QApplication app(argc, argv);
 
-#if 0
-    QWidget window;
-    QPalette palette;
-    palette.setBrush(QPalette::Window, Qt::black);
-    window.setPalette(palette);
-
-    QPushButton *button1 = new QPushButton("A", &window);
-    button1->setObjectName("button1");
-
-    QPushButton *button2 = new QPushButton("B", &window);
-    button2->setObjectName("button2");
-
-    QPushButton *button3 = new QPushButton("C", &window);
-    button3->setObjectName("button3");
-
-    QPushButton *button4 = new QPushButton("D", &window);
-    button4->setObjectName("button4");
-
-#else
-//![1]
-    //QGraphicsRectWidget *button1 = new QGraphicsRectWidget;
-    QGraphicsRectWidget *button2 = new QGraphicsRectWidget;
-    QGraphicsRectWidget *button3 = new QGraphicsRectWidget;
-    QGraphicsRectWidget *button4 = new QGraphicsRectWidget;
-    button2->setZValue(1);
-    button3->setZValue(2);
-    button4->setZValue(3);
-
-    //QPixmap pixmap(":/pacman10-hp-sprite-2");
-
     QGraphicsScene scene(0, 0, 300, 300);
     scene.setBackgroundBrush(Qt::black);
 
-    PixmapItem *button1 = new PixmapItem("google-pacman-sprite", &scene);
-    button1->setSprite(2, 2, 16, 16);
+    Actor *actor1 = new Actor(Actor::Player1);
+    scene.addItem(actor1);
 
-    //scene.addItem(button2);
-    //scene.addItem(button3);
-    //scene.addItem(button4);
-//![1]
     QGraphicsView window(&scene);
     window.setFrameStyle(0);
     window.setAlignment(Qt::AlignLeft | Qt::AlignTop);
     window.setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     window.setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-#endif
-
-#if 0
-//![2]
-    QStateMachine machine;
-
-    QState *group = new QState();
-    group->setObjectName("group");
-    QTimer timer;
-    timer.setInterval(1250);
-    timer.setSingleShot(true);
-    QObject::connect(group, SIGNAL(entered()), &timer, SLOT(start()));
-//![2]
-
-//![3]
-    QState *state1;
-    QState *state2;
-    QState *state3;
-    QState *state4;
-    QState *state5;
-    QState *state6;
-    QState *state7;
-
-    state1 = createGeometryState(button1, QRect(100, 0, 50, 50),
-                                 button2, QRect(150, 0, 50, 50),
-                                 button3, QRect(200, 0, 50, 50),
-                                 button4, QRect(250, 0, 50, 50),
-                                 group);
-//![3]
-    state2 = createGeometryState(button1, QRect(250, 100, 50, 50),
-                                 button2, QRect(250, 150, 50, 50),
-                                 button3, QRect(250, 200, 50, 50),
-                                 button4, QRect(250, 250, 50, 50),
-                                 group);
-    state3 = createGeometryState(button1, QRect(150, 250, 50, 50),
-                                 button2, QRect(100, 250, 50, 50),
-                                 button3, QRect(50, 250, 50, 50),
-                                 button4, QRect(0, 250, 50, 50),
-                                 group);
-    state4 = createGeometryState(button1, QRect(0, 150, 50, 50),
-                                 button2, QRect(0, 100, 50, 50),
-                                 button3, QRect(0, 50, 50, 50),
-                                 button4, QRect(0, 0, 50, 50),
-                                 group);
-    state5 = createGeometryState(button1, QRect(100, 100, 50, 50),
-                                 button2, QRect(150, 100, 50, 50),
-                                 button3, QRect(100, 150, 50, 50),
-                                 button4, QRect(150, 150, 50, 50),
-                                 group);
-    state6 = createGeometryState(button1, QRect(50, 50, 50, 50),
-                                 button2, QRect(200, 50, 50, 50),
-                                 button3, QRect(50, 200, 50, 50),
-                                 button4, QRect(200, 200, 50, 50),
-                                 group);
-//![4]
-    state7 = createGeometryState(button1, QRect(0, 0, 50, 50),
-                                 button2, QRect(250, 0, 50, 50),
-                                 button3, QRect(0, 250, 50, 50),
-                                 button4, QRect(250, 250, 50, 50),
-                                 group);
-    group->setInitialState(state1);
-//![4]
-
-//![5]
-    QParallelAnimationGroup animationGroup;
-    QSequentialAnimationGroup *subGroup;
-
-    QPropertyAnimation *anim = new QPropertyAnimation(button4, "geometry");
-    anim->setDuration(1000);
-    anim->setEasingCurve(QEasingCurve::OutElastic);
-    animationGroup.addAnimation(anim);
-//![5]
-
-//![6]
-    subGroup = new QSequentialAnimationGroup(&animationGroup);
-    subGroup->addPause(100);
-    anim = new QPropertyAnimation(button3, "geometry");
-    anim->setDuration(1000);
-    anim->setEasingCurve(QEasingCurve::OutElastic);
-    subGroup->addAnimation(anim);
-//![6]
-
-    subGroup = new QSequentialAnimationGroup(&animationGroup);
-    subGroup->addPause(150);
-    anim = new QPropertyAnimation(button2, "geometry");
-    anim->setDuration(1000);
-    anim->setEasingCurve(QEasingCurve::OutElastic);
-    subGroup->addAnimation(anim);
-
-    subGroup = new QSequentialAnimationGroup(&animationGroup);
-    subGroup->addPause(200);
-    anim = new QPropertyAnimation(button1, "geometry");
-    anim->setDuration(1000);
-    anim->setEasingCurve(QEasingCurve::OutElastic);
-    subGroup->addAnimation(anim);
-
-//![7]
-    StateSwitcher *stateSwitcher = new StateSwitcher(&machine);
-    stateSwitcher->setObjectName("stateSwitcher");
-    group->addTransition(&timer, SIGNAL(timeout()), stateSwitcher);
-    stateSwitcher->addState(state1, &animationGroup);
-    stateSwitcher->addState(state2, &animationGroup);
-//![7]
-    stateSwitcher->addState(state3, &animationGroup);
-    stateSwitcher->addState(state4, &animationGroup);
-    stateSwitcher->addState(state5, &animationGroup);
-    stateSwitcher->addState(state6, &animationGroup);
-//![8]
-    stateSwitcher->addState(state7, &animationGroup);
-//![8]
-
-//![9]
-    machine.addState(group);
-    machine.setInitialState(group);
-    machine.start();
-//![9]
-#endif
 
     window.resize(300, 300);
     window.show();
diff --git a/pacman-c++/pacman.pro b/pacman-c++/pacman.pro
index 976ad61..a94121d 100644
--- a/pacman-c++/pacman.pro
+++ b/pacman-c++/pacman.pro
@@ -1,5 +1,6 @@
 SOURCES += main.cpp \
-    pixmapitem.cpp
-HEADERS += pixmapitem.h
+    pixmapitem.cpp \
+    actor.cpp
+HEADERS += pixmapitem.h \
+    actor.h
 RESOURCES += pacman.qrc
-
diff --git a/pacman-c++/pixmapitem.cpp b/pacman-c++/pixmapitem.cpp
index 9c2f941..64ac594 100644
--- a/pacman-c++/pixmapitem.cpp
+++ b/pacman-c++/pixmapitem.cpp
@@ -2,43 +2,43 @@
 #include <QPainter>
 
 PixmapItem::PixmapItem(const QString &fileName, QGraphicsItem *parent)
-  : QGraphicsObject(parent), m_x(0), m_y(0)
+    : QGraphicsObject(parent), m_x(0), m_y(0)
 {
-  m_pix  = ":/" + fileName;
-  m_width = m_pix.width();
-  m_height = m_pix.height();
+    m_pix  = ":/" + fileName;
+    m_width = m_pix.width();
+    m_height = m_pix.height();
 }
 
 PixmapItem::PixmapItem(const QString &fileName, QGraphicsScene *scene)
-  : QGraphicsObject(), m_x(0), m_y(0)
+    : QGraphicsObject(), m_x(0), m_y(0)
 {
-  m_pix  = ":/" + fileName;
-  m_width = m_pix.width();
-  m_height = m_pix.height();
-  scene->addItem(this);
+    m_pix  = ":/" + fileName;
+    m_width = m_pix.width();
+    m_height = m_pix.height();
+    scene->addItem(this);
 }
 
 void PixmapItem::setSprite(int x, int y, int width, int height)
 {
-  m_x = x;
-  m_y = y;
-  m_width = width;
-  m_height = height;
+    m_x = x;
+    m_y = y;
+    m_width = width;
+    m_height = height;
 }
 
 QSizeF PixmapItem::size() const
 {
-  return QSizeF(m_width, m_height);
+    return QSizeF(m_width, m_height);
 }
 
 QRectF PixmapItem::boundingRect() const
 {
-  return QRectF(QPointF(0, 0), size());
+    return QRectF(QPointF(0, 0), size());
 }
 
 void PixmapItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
 {
-  painter->drawPixmap(0, 0, m_pix, m_x, m_y, m_width, m_height);
+    painter->drawPixmap(0, 0, m_pix, m_x, m_y, m_width, m_height);
 }
 
 
diff --git a/pacman-c++/pixmapitem.h b/pacman-c++/pixmapitem.h
index 4ea3748..a94c251 100644
--- a/pacman-c++/pixmapitem.h
+++ b/pacman-c++/pixmapitem.h
@@ -4,7 +4,8 @@
 #include <QtGui/QGraphicsObject>
 #include <QtGui/QGraphicsScene>
 
-class PixmapItem : public QGraphicsObject
+class PixmapItem
+    : public QGraphicsObject
 {
 public:
     PixmapItem(const QString &fileName, QGraphicsItem *parent = 0);