diff --git a/assets/Textures/Combo/Combo.psd b/assets/Textures/Combo/Combo.psd new file mode 100755 index 0000000..a37a1fa Binary files /dev/null and b/assets/Textures/Combo/Combo.psd differ diff --git a/assets/Textures/Combo/Combo001.png b/assets/Textures/Combo/Combo001.png new file mode 100755 index 0000000..2d45db7 Binary files /dev/null and b/assets/Textures/Combo/Combo001.png differ diff --git a/assets/Textures/Combo/Combo002.png b/assets/Textures/Combo/Combo002.png new file mode 100755 index 0000000..85be71e Binary files /dev/null and b/assets/Textures/Combo/Combo002.png differ diff --git a/assets/Textures/Combo/Combo003.png b/assets/Textures/Combo/Combo003.png new file mode 100755 index 0000000..63dfc3c Binary files /dev/null and b/assets/Textures/Combo/Combo003.png differ diff --git a/assets/Textures/Combo/Combo004.png b/assets/Textures/Combo/Combo004.png new file mode 100755 index 0000000..080b201 Binary files /dev/null and b/assets/Textures/Combo/Combo004.png differ diff --git a/assets/Textures/Combo/Combo005.png b/assets/Textures/Combo/Combo005.png new file mode 100755 index 0000000..799126e Binary files /dev/null and b/assets/Textures/Combo/Combo005.png differ diff --git a/assets/Textures/Combo/Combo006.png b/assets/Textures/Combo/Combo006.png new file mode 100755 index 0000000..a4dba7a Binary files /dev/null and b/assets/Textures/Combo/Combo006.png differ diff --git a/assets/Textures/Combo/Combo007.png b/assets/Textures/Combo/Combo007.png new file mode 100755 index 0000000..f08bb81 Binary files /dev/null and b/assets/Textures/Combo/Combo007.png differ diff --git a/assets/Textures/Combo/Combo008.png b/assets/Textures/Combo/Combo008.png new file mode 100755 index 0000000..b2da97d Binary files /dev/null and b/assets/Textures/Combo/Combo008.png differ diff --git a/assets/Textures/Combo/Combo009.png b/assets/Textures/Combo/Combo009.png new file mode 100755 index 0000000..56a6ab9 Binary files /dev/null and b/assets/Textures/Combo/Combo009.png differ diff --git a/assets/Textures/Combo/Combo010.png b/assets/Textures/Combo/Combo010.png new file mode 100755 index 0000000..527bf45 Binary files /dev/null and b/assets/Textures/Combo/Combo010.png differ diff --git a/assets/Textures/Combo/Combo011.png b/assets/Textures/Combo/Combo011.png new file mode 100755 index 0000000..e6954e6 Binary files /dev/null and b/assets/Textures/Combo/Combo011.png differ diff --git a/assets/Textures/Combo/Combo012.png b/assets/Textures/Combo/Combo012.png new file mode 100755 index 0000000..cf935a6 Binary files /dev/null and b/assets/Textures/Combo/Combo012.png differ diff --git a/assets/Textures/Combo/Combo013.png b/assets/Textures/Combo/Combo013.png new file mode 100755 index 0000000..1bdce3b Binary files /dev/null and b/assets/Textures/Combo/Combo013.png differ diff --git a/assets/Textures/Combo/Combo014.png b/assets/Textures/Combo/Combo014.png new file mode 100755 index 0000000..61c4acd Binary files /dev/null and b/assets/Textures/Combo/Combo014.png differ diff --git a/assets/Textures/Combo/Combo015.png b/assets/Textures/Combo/Combo015.png new file mode 100755 index 0000000..1c93896 Binary files /dev/null and b/assets/Textures/Combo/Combo015.png differ diff --git a/assets/Textures/Combo/Combo016.png b/assets/Textures/Combo/Combo016.png new file mode 100755 index 0000000..43d5a3d Binary files /dev/null and b/assets/Textures/Combo/Combo016.png differ diff --git a/assets/Textures/Combo/Combo017.png b/assets/Textures/Combo/Combo017.png new file mode 100755 index 0000000..f492038 Binary files /dev/null and b/assets/Textures/Combo/Combo017.png differ diff --git a/assets/Textures/Combo/Combo018.png b/assets/Textures/Combo/Combo018.png new file mode 100755 index 0000000..71156f8 Binary files /dev/null and b/assets/Textures/Combo/Combo018.png differ diff --git a/assets/Textures/Combo/Combo019.png b/assets/Textures/Combo/Combo019.png new file mode 100755 index 0000000..fb8e5ab Binary files /dev/null and b/assets/Textures/Combo/Combo019.png differ diff --git a/assets/Textures/Combo/Combo020.png b/assets/Textures/Combo/Combo020.png new file mode 100755 index 0000000..573b937 Binary files /dev/null and b/assets/Textures/Combo/Combo020.png differ diff --git a/assets/Textures/Combo/Combo021.png b/assets/Textures/Combo/Combo021.png new file mode 100755 index 0000000..397b7ed Binary files /dev/null and b/assets/Textures/Combo/Combo021.png differ diff --git a/assets/Textures/Combo/Combo022.png b/assets/Textures/Combo/Combo022.png new file mode 100755 index 0000000..c75a2b7 Binary files /dev/null and b/assets/Textures/Combo/Combo022.png differ diff --git a/assets/Textures/Combo/Combo023.png b/assets/Textures/Combo/Combo023.png new file mode 100755 index 0000000..1b94495 Binary files /dev/null and b/assets/Textures/Combo/Combo023.png differ diff --git a/assets/Textures/Combo/Combo024.png b/assets/Textures/Combo/Combo024.png new file mode 100755 index 0000000..6a738d6 Binary files /dev/null and b/assets/Textures/Combo/Combo024.png differ diff --git a/assets/Textures/Combo/Combo025.png b/assets/Textures/Combo/Combo025.png new file mode 100755 index 0000000..612d457 Binary files /dev/null and b/assets/Textures/Combo/Combo025.png differ diff --git a/assets/Textures/Combo/Combo026.png b/assets/Textures/Combo/Combo026.png new file mode 100755 index 0000000..7d335d6 Binary files /dev/null and b/assets/Textures/Combo/Combo026.png differ diff --git a/assets/Textures/Combo/Combo027.png b/assets/Textures/Combo/Combo027.png new file mode 100755 index 0000000..15f8379 Binary files /dev/null and b/assets/Textures/Combo/Combo027.png differ diff --git a/assets/Textures/Combo/Combo028.png b/assets/Textures/Combo/Combo028.png new file mode 100755 index 0000000..388361a Binary files /dev/null and b/assets/Textures/Combo/Combo028.png differ diff --git a/assets/Textures/Combo/Combo029.png b/assets/Textures/Combo/Combo029.png new file mode 100755 index 0000000..bec65f4 Binary files /dev/null and b/assets/Textures/Combo/Combo029.png differ diff --git a/assets/Textures/Combo/Combo030.png b/assets/Textures/Combo/Combo030.png new file mode 100755 index 0000000..8c6fb5a Binary files /dev/null and b/assets/Textures/Combo/Combo030.png differ diff --git a/assets/Textures/Combo/Combo031.png b/assets/Textures/Combo/Combo031.png new file mode 100755 index 0000000..589923d Binary files /dev/null and b/assets/Textures/Combo/Combo031.png differ diff --git a/assets/Textures/Combo/Combo032.png b/assets/Textures/Combo/Combo032.png new file mode 100755 index 0000000..1960a25 Binary files /dev/null and b/assets/Textures/Combo/Combo032.png differ diff --git a/assets/Textures/Combo/Combo033.png b/assets/Textures/Combo/Combo033.png new file mode 100755 index 0000000..0bef6cf Binary files /dev/null and b/assets/Textures/Combo/Combo033.png differ diff --git a/assets/Textures/Combo/Combo034.png b/assets/Textures/Combo/Combo034.png new file mode 100755 index 0000000..0794fb4 Binary files /dev/null and b/assets/Textures/Combo/Combo034.png differ diff --git a/assets/Textures/Combo/Combo035.png b/assets/Textures/Combo/Combo035.png new file mode 100755 index 0000000..fb7ae0c Binary files /dev/null and b/assets/Textures/Combo/Combo035.png differ diff --git a/assets/Textures/Combo/Combo036.png b/assets/Textures/Combo/Combo036.png new file mode 100755 index 0000000..657b8ba Binary files /dev/null and b/assets/Textures/Combo/Combo036.png differ diff --git a/assets/Textures/Combo/Combo037.png b/assets/Textures/Combo/Combo037.png new file mode 100755 index 0000000..2efe233 Binary files /dev/null and b/assets/Textures/Combo/Combo037.png differ diff --git a/assets/Textures/Combo/Combo038.png b/assets/Textures/Combo/Combo038.png new file mode 100755 index 0000000..28b81dc Binary files /dev/null and b/assets/Textures/Combo/Combo038.png differ diff --git a/assets/Textures/Combo/Combo039.png b/assets/Textures/Combo/Combo039.png new file mode 100755 index 0000000..23a9349 Binary files /dev/null and b/assets/Textures/Combo/Combo039.png differ diff --git a/assets/Textures/Combo/Combo040.png b/assets/Textures/Combo/Combo040.png new file mode 100755 index 0000000..647ed5f Binary files /dev/null and b/assets/Textures/Combo/Combo040.png differ diff --git a/assets/Textures/Combo/Combo041.png b/assets/Textures/Combo/Combo041.png new file mode 100755 index 0000000..3fff340 Binary files /dev/null and b/assets/Textures/Combo/Combo041.png differ diff --git a/assets/Textures/Combo/Combo042.png b/assets/Textures/Combo/Combo042.png new file mode 100755 index 0000000..c3e2b6d Binary files /dev/null and b/assets/Textures/Combo/Combo042.png differ diff --git a/assets/Textures/Combo/Combo043.png b/assets/Textures/Combo/Combo043.png new file mode 100755 index 0000000..fa3c906 Binary files /dev/null and b/assets/Textures/Combo/Combo043.png differ diff --git a/assets/Textures/GUI/Numbers/SideScoreBackground.png b/assets/Textures/GUI/Numbers/ScoreBackgroundLeft.png similarity index 100% rename from assets/Textures/GUI/Numbers/SideScoreBackground.png rename to assets/Textures/GUI/Numbers/ScoreBackgroundLeft.png diff --git a/assets/Textures/GUI/Numbers/ScoreBackgroundMid.png b/assets/Textures/GUI/Numbers/ScoreBackgroundMid.png new file mode 100755 index 0000000..bd424df Binary files /dev/null and b/assets/Textures/GUI/Numbers/ScoreBackgroundMid.png differ diff --git a/assets/Textures/GUI/Numbers/ScoreBackgroundRight.png b/assets/Textures/GUI/Numbers/ScoreBackgroundRight.png new file mode 100755 index 0000000..d0d4c36 Binary files /dev/null and b/assets/Textures/GUI/Numbers/ScoreBackgroundRight.png differ diff --git a/include/Game/GUI/HUD.h b/include/Game/GUI/HUD.h index 8236d4a..2a7d889 100644 --- a/include/Game/GUI/HUD.h +++ b/include/Game/GUI/HUD.h @@ -26,8 +26,14 @@ public: Width = parent->Width; Height = parent->Height; - m_ScoreBackground = new GUI::TextureFrame(this, "HUDScoreBackgroundFrame"); - m_ScoreBackground->SetTexture("Textures/GUI/Numbers/Background.png"); + m_ScoreBackMid = new GUI::TextureFrame(this, "HUDScoreBackgroundFrame"); + m_ScoreBackMid->SetTexture("Textures/GUI/Numbers/ScoreBackgroundMid.png"); + + m_ScoreBackLeft = new GUI::TextureFrame(this, "HUDScoreBackgroundLeftFrame"); + m_ScoreBackLeft->SetTexture("Textures/GUI/Numbers/ScoreBackgroundLeft.png"); + + m_ScoreBackRight = new GUI::TextureFrame(this, "HUDScoreBackgroundRightFrame"); + m_ScoreBackRight->SetTexture("Textures/GUI/Numbers/ScoreBackgroundRight.png"); m_ScoreNumberFrame = new GUI::NumberFrame(this, "HUDScoreNumberFrame"); //m_ScoreNumberFrame->X = 15; m_ScoreNumberFrame->Y = 18; @@ -52,7 +58,9 @@ public: private: - TextureFrame* m_ScoreBackground = nullptr; + TextureFrame* m_ScoreBackMid = nullptr; + TextureFrame* m_ScoreBackLeft = nullptr; + TextureFrame* m_ScoreBackRight = nullptr; NumberFrame* m_ScoreNumberFrame = nullptr; FPSCounter* m_FPSCounter = nullptr; TextureFrame* m_GameOverFrame = nullptr; @@ -67,9 +75,18 @@ private: void updateScore() { m_ScoreNumberFrame->SetLeft(Width / 2.f - m_ScoreNumberFrame->Width / 2.f); - m_ScoreBackground->SetLeft(m_ScoreNumberFrame->Left() - 20); - m_ScoreBackground->Width = m_ScoreNumberFrame->Width + 40; - m_ScoreBackground->Height = m_ScoreNumberFrame->Height + 30; + + m_ScoreBackMid->SetLeft(m_ScoreNumberFrame->Left()); + m_ScoreBackMid->Width = m_ScoreNumberFrame->Width; + m_ScoreBackMid->Height = m_ScoreNumberFrame->Height + 35; + + m_ScoreBackLeft->SetRight(m_ScoreBackMid->Left()); + m_ScoreBackLeft->Width = 40; + m_ScoreBackLeft->Height = m_ScoreBackMid->Height; + + m_ScoreBackRight->SetLeft(m_ScoreBackMid->Right()); + m_ScoreBackRight->Width = 40; + m_ScoreBackRight->Height = m_ScoreBackMid->Height; } bool OnScore(const Events::ScoreEvent& event)