diff --git a/assets/Textures/GUI/Numbers/Background.png b/assets/Textures/GUI/Numbers/Background.png new file mode 100755 index 0000000..d3ab8a4 Binary files /dev/null and b/assets/Textures/GUI/Numbers/Background.png differ diff --git a/assets/Textures/GUI/Numbers/Blocky/N0.png b/assets/Textures/GUI/Numbers/Blocky/N0.png new file mode 100644 index 0000000..82a7e0f Binary files /dev/null and b/assets/Textures/GUI/Numbers/Blocky/N0.png differ diff --git a/assets/Textures/GUI/Numbers/Blocky/N1.png b/assets/Textures/GUI/Numbers/Blocky/N1.png new file mode 100644 index 0000000..b8c3606 Binary files /dev/null and b/assets/Textures/GUI/Numbers/Blocky/N1.png differ diff --git a/assets/Textures/GUI/Numbers/Blocky/N2.png b/assets/Textures/GUI/Numbers/Blocky/N2.png new file mode 100644 index 0000000..6dfe614 Binary files /dev/null and b/assets/Textures/GUI/Numbers/Blocky/N2.png differ diff --git a/assets/Textures/GUI/Numbers/Blocky/N3.png b/assets/Textures/GUI/Numbers/Blocky/N3.png new file mode 100644 index 0000000..102112a Binary files /dev/null and b/assets/Textures/GUI/Numbers/Blocky/N3.png differ diff --git a/assets/Textures/GUI/Numbers/Blocky/N4.png b/assets/Textures/GUI/Numbers/Blocky/N4.png new file mode 100644 index 0000000..c162544 Binary files /dev/null and b/assets/Textures/GUI/Numbers/Blocky/N4.png differ diff --git a/assets/Textures/GUI/Numbers/Blocky/N5.png b/assets/Textures/GUI/Numbers/Blocky/N5.png new file mode 100644 index 0000000..f4e3fb8 Binary files /dev/null and b/assets/Textures/GUI/Numbers/Blocky/N5.png differ diff --git a/assets/Textures/GUI/Numbers/Blocky/N6.png b/assets/Textures/GUI/Numbers/Blocky/N6.png new file mode 100644 index 0000000..67c9b0d Binary files /dev/null and b/assets/Textures/GUI/Numbers/Blocky/N6.png differ diff --git a/assets/Textures/GUI/Numbers/Blocky/N7.png b/assets/Textures/GUI/Numbers/Blocky/N7.png new file mode 100644 index 0000000..1b348e3 Binary files /dev/null and b/assets/Textures/GUI/Numbers/Blocky/N7.png differ diff --git a/assets/Textures/GUI/Numbers/Blocky/N8.png b/assets/Textures/GUI/Numbers/Blocky/N8.png new file mode 100644 index 0000000..a7ec67a Binary files /dev/null and b/assets/Textures/GUI/Numbers/Blocky/N8.png differ diff --git a/assets/Textures/GUI/Numbers/Blocky/N9.png b/assets/Textures/GUI/Numbers/Blocky/N9.png new file mode 100644 index 0000000..5d2b67a Binary files /dev/null and b/assets/Textures/GUI/Numbers/Blocky/N9.png differ diff --git a/assets/Textures/GUI/Numbers/N0.png b/assets/Textures/GUI/Numbers/N0.png old mode 100644 new mode 100755 index 82a7e0f..53344a7 Binary files a/assets/Textures/GUI/Numbers/N0.png and b/assets/Textures/GUI/Numbers/N0.png differ diff --git a/assets/Textures/GUI/Numbers/N1.png b/assets/Textures/GUI/Numbers/N1.png old mode 100644 new mode 100755 index b8c3606..60d5e59 Binary files a/assets/Textures/GUI/Numbers/N1.png and b/assets/Textures/GUI/Numbers/N1.png differ diff --git a/assets/Textures/GUI/Numbers/N2.png b/assets/Textures/GUI/Numbers/N2.png old mode 100644 new mode 100755 index 6dfe614..d567c06 Binary files a/assets/Textures/GUI/Numbers/N2.png and b/assets/Textures/GUI/Numbers/N2.png differ diff --git a/assets/Textures/GUI/Numbers/N3.png b/assets/Textures/GUI/Numbers/N3.png old mode 100644 new mode 100755 index 102112a..3d662bc Binary files a/assets/Textures/GUI/Numbers/N3.png and b/assets/Textures/GUI/Numbers/N3.png differ diff --git a/assets/Textures/GUI/Numbers/N4.png b/assets/Textures/GUI/Numbers/N4.png old mode 100644 new mode 100755 index c162544..1e304c4 Binary files a/assets/Textures/GUI/Numbers/N4.png and b/assets/Textures/GUI/Numbers/N4.png differ diff --git a/assets/Textures/GUI/Numbers/N5.png b/assets/Textures/GUI/Numbers/N5.png old mode 100644 new mode 100755 index f4e3fb8..9d7a417 Binary files a/assets/Textures/GUI/Numbers/N5.png and b/assets/Textures/GUI/Numbers/N5.png differ diff --git a/assets/Textures/GUI/Numbers/N6.png b/assets/Textures/GUI/Numbers/N6.png old mode 100644 new mode 100755 index 67c9b0d..d81b48b Binary files a/assets/Textures/GUI/Numbers/N6.png and b/assets/Textures/GUI/Numbers/N6.png differ diff --git a/assets/Textures/GUI/Numbers/N7.png b/assets/Textures/GUI/Numbers/N7.png old mode 100644 new mode 100755 index 1b348e3..a82054b Binary files a/assets/Textures/GUI/Numbers/N7.png and b/assets/Textures/GUI/Numbers/N7.png differ diff --git a/assets/Textures/GUI/Numbers/N8.png b/assets/Textures/GUI/Numbers/N8.png old mode 100644 new mode 100755 index a7ec67a..dd18cf8 Binary files a/assets/Textures/GUI/Numbers/N8.png and b/assets/Textures/GUI/Numbers/N8.png differ diff --git a/assets/Textures/GUI/Numbers/N9.png b/assets/Textures/GUI/Numbers/N9.png old mode 100644 new mode 100755 index 5d2b67a..fd303d2 Binary files a/assets/Textures/GUI/Numbers/N9.png and b/assets/Textures/GUI/Numbers/N9.png differ diff --git a/assets/Textures/GUI/Numbers/Squid/N0.png b/assets/Textures/GUI/Numbers/Squid/N0.png new file mode 100755 index 0000000..c02e365 Binary files /dev/null and b/assets/Textures/GUI/Numbers/Squid/N0.png differ diff --git a/assets/Textures/GUI/Numbers/Squid/N1.png b/assets/Textures/GUI/Numbers/Squid/N1.png new file mode 100755 index 0000000..986a2c1 Binary files /dev/null and b/assets/Textures/GUI/Numbers/Squid/N1.png differ diff --git a/assets/Textures/GUI/Numbers/Squid/N2.png b/assets/Textures/GUI/Numbers/Squid/N2.png new file mode 100755 index 0000000..b484a15 Binary files /dev/null and b/assets/Textures/GUI/Numbers/Squid/N2.png differ diff --git a/assets/Textures/GUI/Numbers/Squid/N3.png b/assets/Textures/GUI/Numbers/Squid/N3.png new file mode 100755 index 0000000..7b06407 Binary files /dev/null and b/assets/Textures/GUI/Numbers/Squid/N3.png differ diff --git a/assets/Textures/GUI/Numbers/Squid/N4.png b/assets/Textures/GUI/Numbers/Squid/N4.png new file mode 100755 index 0000000..b6f42fd Binary files /dev/null and b/assets/Textures/GUI/Numbers/Squid/N4.png differ diff --git a/assets/Textures/GUI/Numbers/Squid/N5.png b/assets/Textures/GUI/Numbers/Squid/N5.png new file mode 100755 index 0000000..b20fe44 Binary files /dev/null and b/assets/Textures/GUI/Numbers/Squid/N5.png differ diff --git a/assets/Textures/GUI/Numbers/Squid/N6.png b/assets/Textures/GUI/Numbers/Squid/N6.png new file mode 100755 index 0000000..64ad7e0 Binary files /dev/null and b/assets/Textures/GUI/Numbers/Squid/N6.png differ diff --git a/assets/Textures/GUI/Numbers/Squid/N7.png b/assets/Textures/GUI/Numbers/Squid/N7.png new file mode 100755 index 0000000..e964f34 Binary files /dev/null and b/assets/Textures/GUI/Numbers/Squid/N7.png differ diff --git a/assets/Textures/GUI/Numbers/Squid/N8.png b/assets/Textures/GUI/Numbers/Squid/N8.png new file mode 100755 index 0000000..cd133bc Binary files /dev/null and b/assets/Textures/GUI/Numbers/Squid/N8.png differ diff --git a/assets/Textures/GUI/Numbers/Squid/N9.png b/assets/Textures/GUI/Numbers/Squid/N9.png new file mode 100755 index 0000000..3c41272 Binary files /dev/null and b/assets/Textures/GUI/Numbers/Squid/N9.png differ diff --git a/include/GUI/NumberFrame.h b/include/GUI/NumberFrame.h index 7241b82..003b921 100644 --- a/include/GUI/NumberFrame.h +++ b/include/GUI/NumberFrame.h @@ -10,11 +10,11 @@ namespace dd namespace GUI { -class NumberFrame : public Frame +class NumberFrame : public TextureFrame { public: NumberFrame(Frame* parent, std::string name) - : Frame(parent, name) + : TextureFrame(parent, name) { m_CharacterTextures['0'] = "Textures/GUI/Numbers/N0.png"; m_CharacterTextures['1'] = "Textures/GUI/Numbers/N1.png"; diff --git a/include/Game/GUI/HUD.h b/include/Game/GUI/HUD.h index d374af6..74529ab 100644 --- a/include/Game/GUI/HUD.h +++ b/include/Game/GUI/HUD.h @@ -41,6 +41,7 @@ public: //m_ScoreIndicator = new GUI::TextureFrame(this, "HUDScoreIndicator"); //m_ScoreIndicator->SetTexture("Textures/GUI/HUD/ScoreIndicatorBG.png"); m_ScoreNumberFrame = new GUI::NumberFrame(this, "HUDScoreNumberFrame"); + m_ScoreNumberFrame->SetTexture("Textures/GUI/Numbers/Background.png"); //m_ScoreNumberFrame->X = 15; m_ScoreNumberFrame->Y = 18;