Merge pull request #53 from jonylu7/buttonUpdate01

update
jonylu7 · Apr 12, 2024 · 27d58ce · 27d58ce
2 parents 8c46d7b + c1bdb69
commit 27d58ce
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 13 deletions.
diff --git a/include/Scene/MenuScene.hpp b/include/Scene/MenuScene.hpp
@@ -45,7 +45,6 @@ class MenuScene : public Scene {
         case (SceneMode::DEFAULT):
             m_DefaultScene->Update();
             break;
-        case (SceneMode::MENU):
         }
     }
 

diff --git a/include/Unit/Avatar.hpp b/include/Unit/Avatar.hpp
@@ -28,6 +28,8 @@ class Avatar : public PathfindingUnit,
         setNextCell(destination);
 
         setMovementSpeed(4);
+        m_currentMode=UnitMode::MOVE;
+        m_Transform.scale={0.5,0.5};
     }
     virtual void aliveUpdate() {
         if (walkTowardNextCell() || b_justStarted) {
@@ -40,9 +42,13 @@ class Avatar : public PathfindingUnit,
             printf("(aliveUpdate) getting new dir\n");
         }
         // m_wayPointUnit.Update();
+        SetVisible(true);
         m_Transform.translation = getCurrentLocation();
+
         Draw();
-        printf("-----------------------------\n");
+
+        printf("Avatar cell={%d,%d}\n",getCurrentLocation().x,getCurrentLocation().y);
+        printf("-----------avatar------------------\n");
     }
 
     float getDistance(glm::vec2 cell) {
@@ -98,19 +104,22 @@ class Avatar : public PathfindingUnit,
     }
 
     virtual std::shared_ptr<Util::Image> customizeImage() {
-        return std::make_unique<Util::Image>("../assets/sprites/capybara.png");
+        return std::make_unique<Util::Image>("../assets/sprites/Hunter.png");
     }
     virtual void Update() override {
         switch (m_currentMode) {
         case (UnitMode::DEAD): {
             SetVisible(false);
+            break;
         }
         case (UnitMode::MOVE): {
             aliveUpdate();
+            break;
         }
         case (UnitMode::MOVE_ATTACK): {
             aliveUpdate();
             customizeUpdate();
+            break;
         }
             // attack
         }

diff --git a/src/Map/YAMLReader.cpp b/src/Map/YAMLReader.cpp
@@ -1,6 +1,7 @@
 //
 // Created by 盧威任 on 3/18/24.
 //
+#include <iomanip>
 #include "Map/YAMLReader.hpp"
 #include "Map/Tile.hpp"
 

diff --git a/src/Scene/DefaultScene.cpp b/src/Scene/DefaultScene.cpp
@@ -29,15 +29,15 @@ void DefaultScene::Start() {
 
     //    m_hunter->setCurrentCell({20,10});
     //    m_runner->setCurrentCell({10,10});
-    m_hunter->Start({20, 9});
-    m_runner->Start({9, 10});
-    m_hunter->setTarget(m_runner);
-    m_runner->setBeingChase(m_hunter);
+//    m_hunter->Start({20, 9});
+//    m_runner->Start({9, 10});
+//    m_hunter->setTarget(m_runner);
+//    m_runner->setBeingChase(m_hunter);
 }
 
 void DefaultScene::Update() {
-    m_hunter->Update();
-    m_runner->Update();
+//    m_hunter->Update();
+//    m_runner->Update();
 
     m_GameObjectManager->Update();
 

diff --git a/src/UI/UI.cpp b/src/UI/UI.cpp
@@ -477,7 +477,7 @@ std::shared_ptr<Avatar> UIClass::getUnitFromUI() {
     ButtonScript.setIfReadytoSpawn(false);
     if (std::dynamic_pointer_cast<Infantry>(Avatar)) {
 
-        Avatar->Start(m_barrackCell);
+        Avatar->Start({m_barrackCell.x+1,m_barrackCell.y+1});
         Avatar->setNewDestination(m_barrackTargetCell);
     }
     printf("(UI)return to GOM success\n");

diff --git a/src/UI/UIScriptProcess.cpp b/src/UI/UIScriptProcess.cpp
@@ -116,7 +116,7 @@ void UIScriptProcess::CountDown() {
             b_isSpawningInCooldown) {
             b_isReadyToSpawn = true;
             b_isSpawningInCooldown = false;
-            //        printf("(UISC)Unit Ready\n");
+            printf("(UISC)Unit Ready\n");
         }
     }
 
@@ -126,8 +126,8 @@ void UIScriptProcess::CountDown() {
         // "False");
     }
     if (b_isSpawningInCooldown) {
-        //        printf("(UISC) CD: %.2f,%s\n", unitElapsed.count(),
-        //        elapsed.count() >= m_spawnCooldownTime ? "True" : "False");
+        printf("(UISC) CD: %.2f,%s\n", spawnElapsed.count(),spawnElapsed.count() >= spawnCoolDownTime ? "True" : "False");
+
     }
 }
 void UIScriptProcess::SetBuildCountDown(float time) {