Merge pull request #20 from BrandoZhang/master

Update ItemController.

Author: BrandoZhang

BombingAdventure/CMakeLists.txt

@@ -166,7 +166,8 @@ set(GAME_SRC
         Classes/MonsterController.cpp
         Classes/Item.cpp
         Classes/Bomb.cpp
-        Classes/ItemController.cpp)
+        Classes/ItemController.cpp
+        )
 
 
 set(GAME_HEADERS
@@ -181,7 +182,8 @@ set(GAME_HEADERS
         Classes/MonsterController.h
         Classes/Item.h
         Classes/Bomb.h
-        Classes/ItemController.h)
+        Classes/ItemController.h
+        )
 
 # add the executable
 if(ANDROID)

BombingAdventure/Classes/Entity.cpp

@@ -30,7 +30,11 @@ void Entity::bind_sprite(Sprite *sprite) {
 }
 void Entity::reset_position() {
     if(get_sprite() != NULL) {
-        setPosition(Vec2(CCRANDOM_0_1() * 960, CCRANDOM_0_1() * 640));
+        /* Generate a position in unit Tile     */
+        int target_tile_x = (int) floor(CCRANDOM_0_1() * MAP_SIZE.width);
+        int target_tile_y = (int) floor(CCRANDOM_0_1() * MAP_SIZE.height);
+        /* Set to the position in unit pixel, did not add robust part   */
+        setPosition(Vec2(target_tile_x * TILE_SIZE.width + TILE_SIZE.width / 2, target_tile_y * TILE_SIZE.height + TILE_SIZE.height / 2));
     }
 }
 Vec2 Entity::tileCoordFromPosition(Vec2 position)

BombingAdventure/Classes/GameScene.cpp

@@ -157,7 +157,12 @@ bool GameScene::init() {
 
     /* Initialize an ItemController     */
     ItemController * item_controller = ItemController::create();
-    this->addChild(item_controller,498);
+    item_controller->bind_player(hero);
+    this->addChild(item_controller);
+
+    /* If uncomment the following statement, items will be hid under the bricks    */
+//    item_controller->setGlobalZOrder(0);
+    monster_controller->setGlobalZOrder(99);
 	return true;
 }
 
@@ -183,15 +188,15 @@ void GameScene::update(float delta) {
 	}
 
     /* Test pick_item method    */
-    Item * speed_up_item = Item::create();
-    speed_up_item->setPosition(Vec2(500, 380));
-    this->addChild(speed_up_item);
-
-    auto item_position = tileCoordFromPosition(speed_up_item->getPosition());
-    auto hero_position = tileCoordFromPosition(hero->getPosition());
-    if (item_position == hero_position) {
-        hero->pick_item(*speed_up_item);
-    }
+//    Item * speed_up_item = Item::create();
+//    speed_up_item->setPosition(Vec2(500, 380));
+//    this->addChild(speed_up_item);
+//
+//    auto item_position = tileCoordFromPosition(speed_up_item->getPosition());
+//    auto hero_position = tileCoordFromPosition(hero->getPosition());
+//    if (item_position == hero_position) {
+//        hero->pick_item(*speed_up_item);
+//    }
 }
 
 void GameScene::bomb_explode(Bomb *bomb)

BombingAdventure/Classes/Item.cpp

@@ -3,34 +3,36 @@
 //
 
 #include "Item.h"
+#include "Player.h"
 
 Item::Item() {
     /* Default attributes of a new item     */
     is_picked = false;
-//    item_id = floor(CCRANDOM_0_1() * sizeof(items));
+    item_id = (int) floor(CCRANDOM_0_1() * sizeof(items));
     item_id = 1;
     /* Default view of a new item         */
     bind_sprite(Sprite::create("Item_1.png"));
     this->setAnchorPoint(Vec2(0.5,0.5));
+    this->setGlobalZOrder(0);
 }
 Item::~Item() {
     /* Not yet  */
 }
 bool Item::init() {
     /* Enable update    */
-    this->scheduleUpdate();
+//    this->scheduleUpdate();
     return true;
 }
 int Item::get_item_id() {
     return item_id;
 }
-void Item::update(float delta) {
-    if (get_sprite() == NULL) {
-        return;
-    }
-    if (is_picked) {
-        this->removeAllChildren();
-        this->removeFromParent();
-        log("Item is removed");
-    }
-}
+//void Item::update(float delta) {
+//    if (get_sprite() == NULL) {
+//        return;
+//    }
+//    if (is_picked) {
+//        this->removeAllChildren();
+//        this->removeFromParent();
+//        log("Item is removed");
+//    }
+//}

BombingAdventure/Classes/Item.h

@@ -13,7 +13,7 @@ USING_NS_CC;
 /* Following are the attributes of items    */
 const int ITEM_CURE_BY = 1;
 const int ITEM_ADD_BOMBS_BY = 1;
-const float ITEM_SPEED_UP_BY = 0.5;
+const float ITEM_SPEED_UP_BY = 2.f;
 
 class Item : public Entity {
 public:
@@ -29,7 +29,7 @@ class Item : public Entity {
     virtual bool init();
 
     /* Override update method   */
-    virtual void update(float delta);
+//    virtual void update(float delta);
 
     int get_item_id();
 

BombingAdventure/Classes/ItemController.cpp

@@ -6,18 +6,26 @@
 
 bool ItemController::init() {
     /* Get current time to initialize a random seed     */
-    timeval now;
-    gettimeofday(&now, NULL);
-    auto seed = (unsigned) (now.tv_sec * 1000 + now.tv_usec / 1000);
-    srand(seed);
+//    timeval now;
+//    gettimeofday(&now, NULL);
+//    auto seed = (unsigned) (now.tv_sec * 1000 + now.tv_usec / 1000);
+//    srand(seed);
 
     create_item();
     /* Enable update    */
     this->scheduleUpdate();
     return true;
 }
 void ItemController::update(float delta) {
-
+    for (Item * item : current_item_vector) {
+        if (is_picked(item)) {
+            monitored_player->pick_item(*item);
+            item->removeAllChildren();
+            item->removeFromParent();
+            current_item_vector.eraseObject(item);
+            log("Item is removed.");
+        }
+    }
 }
 void ItemController::create_item() {
     for (int i = 0; i < NUM_ITEMS; i++) {
@@ -30,4 +38,15 @@ void ItemController::create_item() {
         this->addChild(item);
         current_item_vector.pushBack(item);
     }
+}
+void ItemController::bind_player(Player *player) {
+    monitored_player = player;
+}
+bool ItemController::is_picked(Item *item) {
+    /* Get the bounding box of the player   */
+    Rect player_bounding_box = monitored_player->getBoundingBox();
+    Vec2 item_position = item->getPosition();
+    /* Check whether the player and the item has intersection   */
+    item->is_picked = player_bounding_box.containsPoint(item_position);
+    return item->is_picked;
 }

BombingAdventure/Classes/ItemController.h

@@ -7,6 +7,7 @@
 
 #include "cocos2d.h"
 #include "Item.h"
+#include "Player.h"
 
 USING_NS_CC;
 
@@ -21,6 +22,25 @@ class ItemController : public Node {
 
     /* Override update method   */
     virtual void update(float delta);
+
+    /* Method: bind_player
+     * ----------------------
+     * Bind the player to item controller, which
+     * enables it to monitor the operation of
+     * this player.
+     */
+    void bind_player(Player * player);
+
+    /* Method: is_picked
+     * Usage: if (is_picked(item)) do ...
+     * ---------------------------------------
+     * Returns true if the bounding box of the player
+     * intersects with the position of this item. i.e.
+     * The item is picked by the monitored player.
+     * It will also set the status of item to is_picked = true.
+     */
+    bool is_picked(Item * item);
+
 private:
     /* Method: create_item
      * ----------------------
@@ -30,6 +50,8 @@ class ItemController : public Node {
 
     /* Store all the Items   */
     Vector<Item*> current_item_vector;
+
+    Player * monitored_player = NULL;
 };
 
 #endif //BOMBING_ADVENTURE_ITEMCONTROLLER_H

BombingAdventure/Classes/Monster.cpp

@@ -15,7 +15,7 @@ Monster::Monster() {
 
     /* Default view of a new monster         */
     bind_sprite(Sprite::create("stone_monster.png"));
-    this->setAnchorPoint(Vec2(0.5,0.5));
+    this->setAnchorPoint(Vec2(0.35, 0.25));
 }
 Monster::~Monster() {
     /* Not yet  */