GPN

GPN_BadgeLasertag.ino

@@ -42,7 +42,7 @@ GameServer *server;
 GameClient *client;
 char pixIndex = 0;
 bool changePixels = true;
-unsigned long  lastChange = 0;
+unsigned long lastChange = 0;
 unsigned long lastNotificationPull = 0;
 
 void setup() {
@@ -76,6 +76,7 @@ void hostGame() {
 #endif
 
     client = new GameClient(ui, &badge, player);
+    server->setGamestartCallback([=]() { client->startGame(); });
 #ifdef DEBUG
     Serial.printf("Host - Ende\n");
 #endif
@@ -165,6 +166,7 @@ void joinGame() {
 }
 
 void loop() {
+    Serial.println("Loop");
     ui->dispatchInput(badge.getJoystickState());
     ui->draw();
 
@@ -185,11 +187,14 @@ void loop() {
     pixels.show();
 
     if (server) {
+        Serial.println("Loop - Server");
         server->update();
+        Serial.println("Loop - Server - Ende");
     }
     if (client) {
 //        client->update();
     }
+    Serial.println("Loop - Ende");
 }
 
 char *loadNick() {

GameClient.cpp

@@ -6,18 +6,21 @@
 
 void GameClient::createUIGameStart() {
     if (this->playerList) {
-        delete this->playerList;
+        this->playerList->Clear();
+        Serial.println("GameClient::createUIGameStart - Clear");
+    } else {
+        this->playerList = new PlayerListMenu(9);
     }
-    playerList = new PlayerListMenu(9);
+    Serial.println("GameClient::createUIGameStart - new PlayerListMenu");
     playerList->setLeftAction([=]() { this->player->prevWeapon(); });
     playerList->setRightAction([=]() { this->player->nextWeapon(); });
     playerList->setDownAction([=]() { this->player->reload(); });
     playerList->setEnterAction([=]() { this->player->shot(); });
+    Serial.println("GameClient::createUIGameStart - set Lambdas");
     LaserMenuItem *healthMI = new LaserMenuItem([]() {}, "/heart.bmp");
     LaserMenuItem *armorMI = new LaserMenuItem([]() {}, "/armor.bmp");
-    LaserMenuItem *ammoMI = new LaserMenuItem([]() {}, "/ammo.bmp");
+    LaserMenuItem *ammoMI = new LaserMenuItem([]() {}, "/ammo1.bmp");
     LaserMenuItem *nameMI = new LaserMenuItem([]() {}, nullptr);
-    nameMI->setText(player->getNickname());
     player->setHealthMenuItem(healthMI);
     player->setArmorMenuItem(armorMI);
     player->setAmmoMenuItem(ammoMI);
@@ -25,15 +28,19 @@ void GameClient::createUIGameStart() {
     playerList->addMenuItem(armorMI);
     playerList->addMenuItem(ammoMI);
     playerList->addMenuItem(nameMI);
-    ui->open(playerList);
+    Serial.println("GameClient::createUIGameStart - added Lambdas");
+    nameMI->setText(player->getNickname());
+    Serial.println("GameClient::createUIGameStart - set Nickname");
+    playerList->setDirty();
+    reopen = true;
+    Serial.println("GameClient::createUIGameStart - Ende");
 }
 
 
 void GameClient::startGame() {
-#ifdef DEBUG
-    Serial.printf("Start Game!");
-#endif
+    Serial.println("GameClient::startGame()");
     this->createUIGameStart();
+    Serial.println("GameClient::startGame() - Ende");
 }
 
 
@@ -53,17 +60,22 @@ void GameClient::joinGame(String ip) {
 
 
 void GameClient::update() {
-
-    String lastHitBy;
-    int lastDamage;
-
-    if (wasHit(&lastHitBy, &lastDamage)){
-        player->hit(lastDamage);
-
-        tft.setCursor(20, 20);
-        tft.print("Hit by " + lastHitBy);
+    Serial.println("GameClient - Update");
+    if(reopen) {
+        reopen = false;
+        ui->open(playerList);
     }
+//    String lastHitBy;
+//    int lastDamage;
+//
+//    if (wasHit(&lastHitBy, &lastDamage)){
+//        player->hit(lastDamage);
+//
+//        tft.setCursor(20, 20);
+//        tft.print("Hit by " + lastHitBy);
+//    }
 
+    Serial.println("GameClient - Update - Ende");
 }
 
 bool GameClient::wasHit(String* nick, int* damage, bool enable) {

GameClient.hpp

@@ -33,7 +33,7 @@ private:
     char *host = "127.0.0.1"; // MaxArraySize
     PlayerListMenu *playerList = new PlayerListMenu(9);
     WiFiClient *client; // the client connected on client side
-
+    bool reopen = false;
 };
 
 #endif //GPN_LASERTAG_GAMECLIENT_HPP

GameServer.cpp

@@ -22,9 +22,15 @@ void GameServer::secureQuestion() {
     Serial.printf("Sicherheitsabfrage!");
 #endif
     secureMenu = new PlayerListMenu(4);
-    secureMenu->addMenuItem(new MenuItem("Start?", [=]() { this->startGame(); }));
-    secureMenu->addMenuItem(new MenuItem("Cancel?", [=]() { ui->closeCurrent(); }));
-    secureMenu->setRightAction([=]() { ui->closeCurrent(); });
+    secureMenu->addMenuItem(new MenuItem("Start?", [=]() { this->startGame(); Serial.println("Lambda Start - Ende"); }));
+    secureMenu->addMenuItem(new MenuItem("Cancel?", [=]() {
+        ui->open(playerList);
+        ui->draw();
+    }));
+    secureMenu->setRightAction([=]() {
+        ui->open(playerList);
+        ui->draw();
+    });
     secureMenu->setLeftAction([=]() { this->startGame(); });
     ui->open(secureMenu);
 }
@@ -46,13 +52,14 @@ void GameServer::update() {
             handleWelcome(&(serverClients[numConnections]), numConnections);
         }
     } else {
-        for (short i = 0; i <= numConnections; i++) { //iterate throu the slots
+        Serial.println("Waiting for packets");
+        for (short i = 0; i < numConnections; i++) { //iterate throu the slots
             if (serverClients[i].connected() && serverClients[i].available()) { //skip unconnected slots
                 String message = serverClients[i].readStringUntil('\n');
                 UrlDecode decode(message.c_str());
                 String strTyp = String(decode.getKey("typ"));
                 if (strTyp == "hit") {
-                    HitPacket* packet = HitPacket::read(message);
+                    HitPacket *packet = HitPacket::read(message);
                     sendHit(packet);
                     delete packet;
                 }
@@ -72,6 +79,7 @@ void GameServer::handleWelcome(WiFiClient *client, short iPlayer) {
     rPlayers[iPlayer] = player;
     numConnections++;
     sendAll(buildPlayerList());
+    playerList->addMenuItem(new MenuItem(message, []() {}));
 }
 
 void GameServer::sendAll(String value) {
@@ -111,7 +119,7 @@ void GameServer::sendIP() {
 
 void GameServer::startGame() {
     if (!gameStarted) {
-        Serial.println("Game started");
+        Serial.println("Start Game - GameServer");
         ConfigPacket config;
         for (int i = 0; i < 3; i++) {
             config.magazineSize[i] = Player::magazineSize[i];
@@ -123,12 +131,17 @@ void GameServer::startGame() {
         config.health = HEALTH;
         String value = config.serial() + "\n";
         sendAll(value);
+        sendAll(this->buildPlayerList());
         this->gameStarted = true;
-        ui->closeCurrent();
+        if (gameStartCallback) {
+            Serial.println("Start Game - GameServer - call Callback");
+            gameStartCallback();
+        }
+        Serial.println("Start Game - GameServer - Ende");
     }
 }
 
-void GameServer::sendHit(HitPacket* hitPacket) {
+void GameServer::sendHit(HitPacket *hitPacket) {
     int pid = hitPacket->playerId;
     serverClients[pid].print(hitPacket->serial());
     serverClients[pid].flush();

GameServer.hpp

@@ -80,6 +80,10 @@ public:
 
     virtual void update();
 
+    bool isStarted() { return this->gameStarted; }
+
+    void setGamestartCallback(std::function<void(void)> callback) { this->gameStartCallback = callback; }
+
 protected:
     void setTeamPlay(char isTeam);
 
@@ -95,6 +99,7 @@ protected:
 
     void sendHit(HitPacket *hitPacket);
 
+
 private:
     WindowSystem *ui;
     Badge *badge;
@@ -105,6 +110,7 @@ private:
     WiFiClient *serverClients; // the clients connected to the server
     short numConnections = 0;
     bool gameStarted = false;
+    std::function<void(void)> gameStartCallback;
 
     void sendIP();
 

LaserMenuItem.cpp

@@ -11,6 +11,7 @@ uint32_t read32(File &f);
 uint16_t read16(File &f);
 
 void LaserMenuItem::bmpDraw(uint8_t x, uint16_t y, TFT_ILI9163C *tft) {
+    Serial.println("LaserMenuItem::bmpDraw");
     if (this->imagePath) {
         File bmpFile;
         uint16_t bmpWidth, bmpHeight;   // W+H in pixels
@@ -96,4 +97,5 @@ void LaserMenuItem::bmpDraw(uint8_t x, uint16_t y, TFT_ILI9163C *tft) {
             tft->print("file unrecognized!");
         }
     }
+    Serial.println("LaserMenuItem::bmpDraw - Ende");
 }

LaserMenuItem.hpp

@@ -10,9 +10,12 @@
 #include "BadgeUI.h"
 class LaserMenuItem : public MenuItem {
 public:
-    LaserMenuItem(std::function<void(void)> trigger, const char *imagePath) :
+    LaserMenuItem(std::function<void(void)> trigger, const char* imagePath) :
             MenuItem("100%", trigger), imagePath(imagePath) {
     };
+
+    void setImagePath(String imagePath) { this->imagePath = imagePath.c_str(); }
+
 private:
     const char *imagePath;
     void bmpDraw(uint8_t, uint16_t, TFT_ILI9163C*);

Player.cpp

@@ -49,7 +49,8 @@ void Player::updateArmorMenuItem() {
         snprintf(buff, sizeof(buff), "%d %", this->currentArmor / this->maxArmor * 100);
         String percentage = buff;
         delete[] buff;
-        this->healthMenuItem->setText(percentage);
+        this->armorMenuItem->setText(percentage);
+        this->armorMenuItem->setImagePath(String("/ammo" + String(this->weaponIndex) + ".bmp"));
     }
 }
 

PlayerListMenu.hpp

@@ -44,9 +44,6 @@ public:
     unsigned short getIndex() { return index; }
 
     void dispatchInput(JoystickState state) {
-#ifdef DEBUG
-        Serial.println("PlayerListMenu - dispatch");
-#endif
         switch (state) {
             case JoystickState::BTN_UP:
                 if (upAction) {
@@ -87,9 +84,6 @@ public:
                 Menu::dispatchInput(state);
                 break;
         }
-#ifdef DEBUG
-        Serial.println("PlayerListMenu - dispatch - Ende");
-#endif
     };
 
     void addMenuItem(MenuItem *item) {