Merge pull request #34 from huhuhu0420/main

add sidebar & solve mouse move detect error
nonorze-VOXX · Apr 6, 2023 · 24a12bc · 24a12bc
2 parents 1edd592 + 679c8cc
commit 24a12bc
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 13 deletions.
diff --git a/Resources/map/easy/sidebar.bmp b/Resources/map/easy/sidebar.bmp
diff --git a/Resources/map/hard/sidebar.bmp b/Resources/map/hard/sidebar.bmp
diff --git a/Resources/map/medium/sidebar.bmp b/Resources/map/medium/sidebar.bmp
diff --git a/Source/Game/BtdClass/GameManager.cpp b/Source/Game/BtdClass/GameManager.cpp
@@ -160,8 +160,8 @@ namespace Btd
     void GameManager::OnShow()
     {
         map->ShowBackground();
-        map->ShowFactoryButton();
         map->ShowRoad();
+        map->ShowFactoryButton();
         for (int i = 0; i < static_cast<int>(TowerFactory::TowerVector.size()); i++)
         {
             TowerFactory::TowerVector[i]->TowerShow();

diff --git a/Source/Game/BtdClass/TowerFactory.cpp b/Source/Game/BtdClass/TowerFactory.cpp
@@ -52,15 +52,15 @@ void Btd::TowerFactory::MakeTower(TowerType attribute)
         }
     case ice:
         {
-            shared_ptr<IceTower> ice = make_shared<IceTower>(IceTower());
-            ice->LoadBitmapByString({"resources/towers/ice/tower_ice.bmp"}, RGB(0, 0, 0));
-            ice->SetCenter(GetCursorPosX(), GetCursorPosY());
-            ice->SetIsMove(true);
-            ice->SetShootDeltaTime(3);
-            ice->SetActive(false);
-            ice->RangeCircle.LoadBitmapByString({"resources/towers/range.bmp", "resources/towers/range_red.bmp"}, RGB(0, 0, 0));
-            ice->RangeCircle.SetCenter(GetCursorPosX(), GetCursorPosY());
-            TowerVector.push_back(ice);
+            // shared_ptr<IceTower> ice = make_shared<IceTower>(IceTower());
+            // ice->LoadBitmapByString({"resources/towers/ice/tower_ice.bmp"}, RGB(0, 0, 0));
+            // ice->SetCenter(GetCursorPosX(), GetCursorPosY());
+            // ice->SetIsMove(true);
+            // ice->SetShootDeltaTime(3);
+            // ice->SetActive(false);
+            // ice->RangeCircle.LoadBitmapByString({"resources/towers/range.bmp", "resources/towers/range_red.bmp"}, RGB(0, 0, 0));
+            // ice->RangeCircle.SetCenter(GetCursorPosX(), GetCursorPosY());
+            // TowerVector.push_back(ice);
         }
     default:
         break;

diff --git a/Source/Game/BtdClass/map.cpp b/Source/Game/BtdClass/map.cpp
@@ -101,6 +101,8 @@ namespace Btd
             tmpRoad.SetTag("road");
             _road.push_back(tmpRoad);
         }
+        _sidebar.LoadBitmapByString({"resources/map/" + roadPath[type] + "/sidebar.bmp"});
+        _sidebar.SetTopLeft(732, 11);
     }
 
     void Map::ShowRoad()
@@ -109,6 +111,7 @@ namespace Btd
         {
             _road[i].ShowBitmap();
         }
+        _sidebar.ShowBitmap();
     }
 
     void Map::InitBackground(MapType::MapType type)
@@ -200,6 +203,10 @@ namespace Btd
                 return true;
             }
         }
+        if (Btd::IsOverlap(_sidebar, target))
+        {
+            return true;
+        }
         return false;
     };
 

diff --git a/Source/Game/BtdClass/map.h b/Source/Game/BtdClass/map.h
@@ -39,6 +39,7 @@ namespace Btd
         static vector<Vector2> _route;
         static Vector2 _startPosition;
         vector<vector<UnitRound>> _rounds;
+        GameObject _sidebar;
     };
 }
 

diff --git a/Source/Game/mygame_initialize.cpp b/Source/Game/mygame_initialize.cpp
@@ -84,11 +84,17 @@ void CGameStateInit::OnLButtonDown(UINT nFlags, CPoint point)
 
 void CGameStateInit::OnMouseMove(UINT nFlags, CPoint point)
 {
-    for (int i = 0; i < 3; i++)
+    if (_mapButton[2].IsBitmapLoaded())
     {
-        if (IsCursorInObj(static_cast<Btd::GameObject>(_mapButton[i])))
+        for (int i = 0; i < 3; i++)
         {
-            map = selectedMaps[i];
+            if (IsCursorInObj(static_cast<Btd::GameObject>(_mapButton[i])))
+            {
+                if (Btd::IsCursorInObj(static_cast<Btd::GameObject>(_mapButton[i])))
+                {
+                    map = selectedMaps[i];
+                }
+            }
         }
     }
 }