Use only 1 color format for everything

Simple map parsing for Blocks and Bonus points

1 files changed, 61 insertions, 0 deletions

diff --git a/pacman-c++/mainwidget.cpp b/pacman-c++/mainwidget.cpp
index 982c809..72d9c8a 100644
--- a/pacman-c++/mainwidget.cpp
+++ b/pacman-c++/mainwidget.cpp
@@ -2,6 +2,8 @@
 
 #include "actor.h"
 #include "block.h"
+#include "bonuspoint.h"
+#include "constants.h"
 
 MainWidget::MainWidget() {
 
@@ -26,8 +28,62 @@ MainWidget::MainWidget() {
   loadDummyMap();
 }
 
+// temporary
+transmission::map_t createDummyMap() {
+  transmission::map_t map;
+  map = new transmission::field_t*[map_size[0]];
+  for (unsigned int i=0; i<map_size[0]; ++i) {
+    map[i] = new transmission::field_t[map_size[1]];
+  }
+  for (unsigned int x=0; x<map_size[0]; ++x) {
+    for (unsigned int y=0; y<map_size[1]; ++y) {
+      transmission::field_t &cur = map[x][y];
+      cur = 0;
+    }
+  }
+
+  map[4][3] |= green;
+  map[4][3] |= transmission::block;
+  
+  map[5][3] |= noColor;
+  map[5][3] |= transmission::block;
+  map[6][3] |= noColor;
+  map[6][3] |= transmission::block;
+  map[7][3] |= red;
+  map[7][3] |= transmission::block;
+  
+  map[7][5] |= transmission::bonuspoint;
+  
+  return map;
+}
 void MainWidget::loadDummyMap()
 {
+  transmission::map_t map = createDummyMap();
+
+  for (unsigned int x=0; x<map_size[0]; ++x) {
+    for (unsigned int y=0; y<map_size[1]; ++y) {
+      const transmission::field_t &cur = map[x][y];
+      if (cur == 0) {
+        continue;
+      }
+      qDebug() << "not 0 at " << x << "," << y << ":" << cur;
+      
+      Color color = static_cast<Color>(cur & transmission::color_mask);
+      qDebug() << "col " << color;
+
+      PixmapItem *item = 0;
+      if (cur & transmission::block) {
+        item = new Block(color);
+      } else if (cur & transmission::bonuspoint) {
+        item = new BonusPoint();
+      }
+      Q_ASSERT(item != 0);
+      scene->addItem(item);
+      item->setPos( mapPositionToCoord(x, y) );
+    }
+  }
+
+  /*
   Actor *actor3 = new Actor(Actor::Player3);
   scene->addItem(actor3);
   actor3->setPos(140, 100);
@@ -37,5 +93,10 @@ void MainWidget::loadDummyMap()
     scene->addItem(b);
     b->setPos( 100 + i*16, 200);
   }
+  */
+}
 
+QPoint MainWidget::mapPositionToCoord(unsigned int x, unsigned int y)
+{
+  return QPoint(x * field_size[0], y * field_size[1]);
 }