Merge pull request #69 from jonylu7/UnitManager_Update

local changes

CMakeLists.txt

@@ -70,13 +70,14 @@ set(SRC_FILES
         ${SRC_DIR}/Util/GameObject.cpp
         ${SRC_DIR}/Util/Renderer.cpp
         ${SRC_DIR}/Util/Color.cpp
+        ${SRC_DIR}/Util/Animation.cpp
+        ${SRC_DIR}/Util/MissingTexture.cpp
 
 
         ${SRC_DIR}/Display/ImageArray.cpp
         ${SRC_DIR}/Display/CustomizableImage.cpp
         ${SRC_DIR}/Display/SpriteSheetAnimation.cpp
-        ${SRC_DIR}/Display/Animation.cpp
-        ${SRC_DIR}/Display/MissingTexture.cpp
+
         ${SRC_DIR}/Display/Grid.cpp
         ${SRC_DIR}/Display/SpriteSheet.cpp
 
@@ -152,17 +153,17 @@ set(INCLUDE_FILES
         ${INCLUDE_DIR}/Util/Keycode.hpp
         ${INCLUDE_DIR}/Util/SFX.hpp
         ${INCLUDE_DIR}/Util/BGM.hpp
-
         ${INCLUDE_DIR}/Util/Text.hpp
         ${INCLUDE_DIR}/Util/Transform.hpp
         ${INCLUDE_DIR}/Util/TransformUtils.hpp
         ${INCLUDE_DIR}/Util/GameObject.hpp
         ${INCLUDE_DIR}/Util/Renderer.hpp
         ${INCLUDE_DIR}/Util/Color.hpp
         ${INCLUDE_DIR}/Util/Image.hpp
+        ${INCLUDE_DIR}/Util/Animation.hpp
+        ${INCLUDE_DIR}/Util/MissingTexture.hpp
+
 
-        ${INCLUDE_DIR}/Display/Animation.hpp
-        ${INCLUDE_DIR}/Display/MissingTexture.hpp
         ${INCLUDE_DIR}/Display/SpriteSheetAnimation.hpp
         ${INCLUDE_DIR}/Display/ImageArray.hpp
         ${INCLUDE_DIR}/Display/CustomizableImage.hpp

include/Avatar/Avatar.hpp

@@ -8,12 +8,12 @@
 #include "Avatar/AvatarOrder.hpp"
 #include "Avatar/Moving.hpp"
 #include "Avatar/PathUtility.hpp"
-#include "Display/Image.hpp"
 #include "Display/SpriteSheet.hpp"
 #include "Display/SpriteSheetAnimation.hpp"
 #include "Map/MapUtility.hpp"
 #include "Mechanics/GameObjectID.hpp"
 #include "Selectable.hpp"
+#include "Util/Image.hpp"
 
 class Avatar : public Moving,
                public AttackAndDamage,

include/Display/DrawOverlays.hpp

@@ -5,7 +5,7 @@
 #ifndef PRACTICALTOOLSFORSIMPLEDESIGN_DRAWOVERLAYS_HPP
 #define PRACTICALTOOLSFORSIMPLEDESIGN_DRAWOVERLAYS_HPP
 #include "Core/Drawable.hpp"
-#include "Display/Image.hpp"
+#include "Util/Image.hpp"
 #include "Util/TransformUtils.hpp"
 #include "pch.hpp"
 class DrawOverlays : public Core::Drawable {

include/Display/Sprite.hpp

@@ -5,8 +5,8 @@
 #ifndef PRACTICALTOOLSFORSIMPLEDESIGN_SPRITE_HPP
 #define PRACTICALTOOLSFORSIMPLEDESIGN_SPRITE_HPP
 #include "Core/Drawable.hpp"
-#include "Display/Image.hpp"
 #include "Util/CustomizableImage.hpp"
+#include "Util/Image.hpp"
 #include "pch.hpp" // IWYU pragma: export
 
 class Sprite : public Core::Drawable {

include/Display/SpriteSheetAnimation.hpp

@@ -12,7 +12,7 @@
 
 #include "Core/Drawable.hpp"
 
-#include "Image.hpp"
+#include "Util/Image.hpp"
 
 namespace Util {
 /**

include/Map/YAMLReader.hpp

@@ -4,9 +4,9 @@
 
 #ifndef PRACTICALTOOLSFORSIMPLEDESIGN_YAMLREADER_HPP
 #define PRACTICALTOOLSFORSIMPLEDESIGN_YAMLREADER_HPP
-#include "Display/Image.hpp"
 #include "TerrainConfig.hpp"
 #include "Tile.hpp"
+#include "Util/Image.hpp"
 #include <fstream>
 #include <iostream>
 #include <yaml-cpp/yaml.h>

include/Mechanics/NemesisManager.hpp

@@ -5,7 +5,7 @@
 #ifndef PRACTICALTOOLSFORSIMPLEDESIGN_NEMESISMANAGER_HPP
 #define PRACTICALTOOLSFORSIMPLEDESIGN_NEMESISMANAGER_HPP
 #include "Map/MapUtility.hpp"
-#define ATTACK_RANGE 5
+
 class NemesisManager {
 public:
     NemesisManager() {}
@@ -32,11 +32,13 @@ class NemesisManager {
         if (ifAvatarHasNemesis(hunter) == false) {
             return false;
         }
-        if (hunter.getDistance(m_Nemesis[hunter].getCurrentCell()) <= ATTACK_RANGE) // check with in range
+        if (hunter->getDistance(m_Nemesis[hunter]->getCurrentCell()) <=
+            hunter->getWeapon()->getFireRange()) // check with in range
         {
             return true;
         } else {
-            forceMove(hunter,m_Nemesis[hunter].getCurrentCell());//向目標移動
+            // forceMove(hunter,
+            //           m_Nemesis[hunter]->getCurrentCell()); // 向目標移動
             return false;
         }
     }
@@ -49,7 +51,7 @@ class NemesisManager {
                 hunter->setAvatarOrder(AvatarOrderType::OPEN_FIRE);
                 prey->setAvatarOrder(AvatarOrderType::TAKEN_DAMAGE);
                 hunter->getAttackAndDamager()->openFireToTarget(prey);
-                //反擊
+                // 反擊
                 prey->setAvatarOrder(AvatarOrderType::OPEN_FIRE);
                 hunter->setAvatarOrder(AvatarOrderType::TAKEN_DAMAGE);
                 prey->getAttackAndDamager()->openFireToTarget(prey);

include/Mechanics/UnitManager.hpp

@@ -74,11 +74,13 @@ class UnitManager : public Player {
 
     void spawn(std::shared_ptr<MapClass> m_Map, UnitType unit,
                HouseType house) {
+
         if (house == HouseType::ENEMY) {
             // m_Enemy->addUnitConstructCount(unit, 1);
         } else {
             //                m_Player->setUnitConstructCount(unit, 1);
         }
+
         switch (unit) {
         case UnitType::INFANTRY: {
             auto avatar = std::make_shared<Infantry>(house);
@@ -89,12 +91,13 @@ class UnitManager : public Player {
                 return;
             }
 
+
+
             avatar->Start(m_StructureManager->getStructureArray()
                               ->getPlayerBarrackCell());
             //                avatar
             //                ->setNewDestination(m_StructureManager.getStructureArray().getPlayerWayPointCell());
             m_AvatarManager->AppendAvatar(avatar);
-            break;
         }
 
         default: {
@@ -216,4 +219,5 @@ class UnitManager : public Player {
     std::chrono::high_resolution_clock::time_point m_StartTime;
     double m_lastElapsed = 0.F;
 };
+
 #endif // PRACTICALTOOLSFORSIMPLEDESIGN_UNITMANAGER_HPP

include/Scene/Scene.hpp

@@ -13,7 +13,6 @@
 #include "Camera.hpp"
 #include "Display/DrawOverlays.hpp"
 #include "Display/Grid.hpp"
-#include "Display/Image.hpp"
 #include "Display/SpriteSheet.hpp"
 #include "Map/Map.hpp"
 #include "Structure/AdvencePowerPlants.hpp"
@@ -24,6 +23,7 @@
 #include "Structure/WarFactory.hpp"
 #include "Structure/WayPoint.hpp"
 #include "UI/UI.hpp"
+#include "Util/Image.hpp"
 #include "Util/Input.hpp"
 #include "Util/Keycode.hpp"
 #include "Util/Logger.hpp"
@@ -47,7 +47,8 @@ class Scene {
 
 protected:
     std::shared_ptr<MapClass> m_Map = std::make_shared<MapClass>();
-    std::shared_ptr<CameraClass> m_SceneCamera  = std::make_shared<CameraClass>();
+    std::shared_ptr<CameraClass> m_SceneCamera =
+        std::make_shared<CameraClass>();
     std::shared_ptr<UnitManager> m_GameObjectManager =
         std::make_shared<UnitManager>();
     std::shared_ptr<UnitManager> m_EnemyObjectManager =

include/Structure/Structure.hpp

@@ -5,13 +5,13 @@
 #ifndef PRACTICALTOOLSFORSIMPLEDESIGN_STRUCTURE_HPP
 #define PRACTICALTOOLSFORSIMPLEDESIGN_STRUCTURE_HPP
 #include "Avatar/AttackAndDamage.hpp"
-#include "Display/Image.hpp"
 #include "Display/SpriteSheet.hpp"
 #include "Display/SpriteSheetAnimation.hpp"
 #include "HighLight.h"
 #include "Mechanics/GameObjectID.hpp"
 #include "Selectable.hpp"
 #include "Structure/StructureOrder.hpp"
+#include "Util/Image.hpp"
 
 #include "Unit/Health.hpp"
 #include "Unit/IHealthable.hpp"
@@ -70,8 +70,8 @@ class Structure : public Util::GameObject,
     virtual void SetSpriteSheet() {
         m_StructureSpriteSheet->Start(
             "../assets/sprites/Barracks_SpriteSheet.png", 48, 48, 13, 0);
-        m_SpriteSheetAnimation->initSpriteSheetAnimation(m_StructureSpriteSheet,
-                                                         false, INTERVAL, false);
+        m_SpriteSheetAnimation->initSpriteSheetAnimation(
+            m_StructureSpriteSheet, false, INTERVAL, false);
     }
 
     virtual void SetObjectLocation(glm::vec2 location);
@@ -86,7 +86,7 @@ class Structure : public Util::GameObject,
     float getElectricPower() { return this->m_ElectricPower; }
     float getBuildingTime() { return this->m_BuildingTime; }
     float getBuildingCost() { return this->m_BuildingCost; }
-    HouseType getHouseType(){return  this->m_ID.getHouseType();}
+    HouseType getHouseType() { return this->m_ID.getHouseType(); }
 
     glm::vec2 GlobalCoordToCellCoord(glm::vec2 globalCoord) {
         return glm::vec2(int(globalCoord[0] / CELL_SIZE.x),
@@ -126,7 +126,7 @@ class Structure : public Util::GameObject,
                                 m_ObjectLocation.y + CELL_SIZE.y};
     glm::vec2 m_ObjectLocation = {100, 100};
     std::vector<glm::vec2> m_RelativeOccupiedArea = {{0, 0}};
-    
+
     // health
     std::shared_ptr<Health> m_Health = std::make_shared<Health>();
     // attack and damage

include/Structure/WayPoint.hpp

@@ -4,8 +4,8 @@
 
 #ifndef PRACTICALTOOLSFORSIMPLEDESIGN_WAYPOINT_HPP
 #define PRACTICALTOOLSFORSIMPLEDESIGN_WAYPOINT_HPP
-#include "Display/Image.hpp"
 #include "Util/GameObject.hpp"
+#include "Util/Image.hpp"
 #include "Util/TransformUtils.hpp"
 class WayPoint : public Util::GameObject {
 private:

include/Structure/WayPointStructure.hpp

@@ -5,12 +5,12 @@
 #ifndef PRACTICALTOOLSFORSIMPLEDESIGN_MOVEABLESTRUCTURE_HPP
 #define PRACTICALTOOLSFORSIMPLEDESIGN_MOVEABLESTRUCTURE_HPP
 #include "Display/Grid.hpp"
-#include "Display/Image.hpp"
 #include "Display/Line.hpp"
 #include "HighLight.h"
 #include "Map/MapUtility.hpp"
 #include "Structure/IWayPoint.hpp"
 #include "Structure/Structure.hpp"
+#include "Util/Image.hpp"
 #include "Util/Input.hpp"
 #include "Util/Keycode.hpp"
 #include "WayPoint.hpp"

src/Display/Animation.cpp → src/Util/Animation.cpp

@@ -1,4 +1,4 @@
-#include "Display/Animation.hpp"
+#include "Util/Animation.hpp"
 #include "Util/Logger.hpp"
 #include "Util/Time.hpp"
 

src/Util/Image.cpp

@@ -1,11 +1,11 @@
-#include "Display/Image.hpp"
+#include "Util/Image.hpp"
 
 #include "pch.hpp"
 
 #include "Core/Texture.hpp"
 #include "Core/TextureUtils.hpp"
 
-#include "Display/MissingTexture.hpp"
+#include "Util/MissingTexture.hpp"
 #include "Util/TransformUtils.hpp"
 
 #include "config.hpp"

src/Display/MissingTexture.cpp → src/Util/MissingTexture.cpp

@@ -2,7 +2,7 @@
 #include "SDL_image.h"
 #include "Util/Logger.hpp"
 
-#include "Display/MissingTexture.hpp"
+#include "Util/MissingTexture.hpp"
 
 SDL_Surface *GetMissingTextureSDLSurface() {
     SDL_RWops *rwop = SDL_RWFromConstMem(MISSING_TEXTURE_BASE64_DECODE.data(),

src/Util/Text.cpp

@@ -3,8 +3,8 @@
 #include "Core/Texture.hpp"
 #include "Core/TextureUtils.hpp"
 
-#include "Display/Text.hpp"
 #include "Util/Logger.hpp"
+#include "Util/Text.hpp"
 #include "Util/TransformUtils.hpp"
 
 #include "config.hpp"