From f366d73e81c703748db8f68d22995c989f745e86 Mon Sep 17 00:00:00 2001 From: ThePythonator <49040244+ThePythonator@users.noreply.github.com> Date: Tue, 1 Mar 2022 18:06:19 +0000 Subject: [PATCH] Added title text. --- Constants.cpp | 8 ++++++-- Constants.hpp | 8 ++++++-- Game.cpp | 17 +++++++++++------ Game.hpp | 2 +- assets/title.png | Bin 0 -> 1562 bytes 5 files changed, 24 insertions(+), 11 deletions(-) create mode 100644 assets/title.png diff --git a/Constants.cpp b/Constants.cpp index 3a0d863..edd6703 100644 --- a/Constants.cpp +++ b/Constants.cpp @@ -12,11 +12,13 @@ namespace SPRITES { const uint8_t SIZE_HALF = SIZE / 2; const uint8_t SPACE_WIDTH = 1; + const uint8_t TITLE_SPACE_WIDTH = 2; const uint8_t TEXT_OFFSET_X = SIZE * 4;// 5 or 6 work too, but text looks too wide when beziering const uint8_t TEXT_LOCKED_ALPHA = 96; const uint8_t TEXT_HINT_ALPHA = 128; + const uint8_t TEXT_TITLE_ALPHA = 128; } namespace TILE_ID { @@ -317,6 +319,8 @@ namespace STRINGS { const std::string HEADING_BLUE = "A PAIR OF"; const std::string HEADING_PINK = "SQUARES"; + const std::string HEADING = "A PAIR OF SQUARES"; // "A Pair Of Squares"; + const std::string OPTION_PLAY = "Play"; const std::string OPTION_SETTINGS = "Settings"; const std::string OPTION_QUIT = "Quit"; @@ -362,8 +366,8 @@ namespace FILES { const std::string SPRITESHEET = "spritesheet.png"; const std::string FONT_SHEET = "font.png";//"another-font.png"//"another-another-font.png"; - const std::string TITLE_BLUE_FONT_SHEET = "title_blue.png"; - const std::string TITLE_PINK_FONT_SHEET = "title_pink.png"; + //const std::string TITLE_BLUE_FONT_SHEET = "title.png";// "title_blue.png"; + //const std::string TITLE_PINK_FONT_SHEET = "title_pink.png"; const std::string WINDOW_ICON = "icon.png"; diff --git a/Constants.hpp b/Constants.hpp index a225931..ce99e87 100644 --- a/Constants.hpp +++ b/Constants.hpp @@ -20,11 +20,13 @@ namespace SPRITES { extern const uint8_t SIZE_HALF; extern const uint8_t SPACE_WIDTH; + extern const uint8_t TITLE_SPACE_WIDTH; extern const uint8_t TEXT_OFFSET_X;// 5 or 6 work too, but text looks too wide when beziering extern const uint8_t TEXT_LOCKED_ALPHA; extern const uint8_t TEXT_HINT_ALPHA; + extern const uint8_t TEXT_TITLE_ALPHA; } namespace TILE_ID { @@ -298,6 +300,8 @@ namespace STRINGS { extern const std::string HEADING_BLUE; extern const std::string HEADING_PINK; + extern const std::string HEADING; + extern const std::string OPTION_PLAY; extern const std::string OPTION_SETTINGS; extern const std::string OPTION_QUIT; @@ -343,8 +347,8 @@ namespace FILES { extern const std::string SPRITESHEET; extern const std::string FONT_SHEET; - extern const std::string TITLE_BLUE_FONT_SHEET; - extern const std::string TITLE_PINK_FONT_SHEET; + //extern const std::string TITLE_BLUE_FONT_SHEET; + //extern const std::string TITLE_PINK_FONT_SHEET; extern const std::string WINDOW_ICON; diff --git a/Game.cpp b/Game.cpp index 1779146..6d43b25 100644 --- a/Game.cpp +++ b/Game.cpp @@ -136,8 +136,8 @@ void Game::load_data() { spritesheet = Spritesheet(renderer, spritesheet_texture, SPRITES::SIZE, SPRITES::SCALE); SDL_Surface* font_sheet_surface = load_surface(assets_path + FILES::FONT_SHEET); - SDL_Surface * title_font_blue_sheet_surface = load_surface(assets_path + FILES::TITLE_BLUE_FONT_SHEET); - SDL_Surface* title_font_pink_sheet_surface = load_surface(assets_path + FILES::TITLE_PINK_FONT_SHEET); + //SDL_Surface * title_font_blue_sheet_surface = load_surface(assets_path + FILES::TITLE_BLUE_FONT_SHEET); + //SDL_Surface* title_font_pink_sheet_surface = load_surface(assets_path + FILES::TITLE_PINK_FONT_SHEET); //font_black = FontHandler::Font(renderer, font_sheet_texture, font_sheet_surface, SPRITES::SIZE, SPRITE_SCALE, COLOURS::BLACK); @@ -148,12 +148,12 @@ void Game::load_data() { font_hint = FontHandler::Font(renderer, font_sheet_surface, SPRITES::SIZE, SPRITES::TEXT_HINT_SCALE, COLOURS::WHITE, COLOURS::TRUE_WHITE); font_hint.set_alpha(SPRITES::TEXT_HINT_ALPHA); - font_title_blue = FontHandler::Font(renderer, title_font_blue_sheet_surface, SPRITES::SIZE, SPRITES::TEXT_SCALE, COLOURS::TRUE_WHITE); - font_title_pink = FontHandler::Font(renderer, title_font_pink_sheet_surface, SPRITES::SIZE, SPRITES::TEXT_SCALE, COLOURS::TRUE_WHITE); + //font_title_blue = FontHandler::Font(renderer, title_font_blue_sheet_surface, SPRITES::SIZE, SPRITES::TEXT_SCALE, COLOURS::TRUE_WHITE); + //font_title_pink = FontHandler::Font(renderer, title_font_pink_sheet_surface, SPRITES::SIZE, SPRITES::TEXT_SCALE, COLOURS::TRUE_WHITE); SDL_FreeSurface(font_sheet_surface); - SDL_FreeSurface(title_font_blue_sheet_surface); - SDL_FreeSurface(title_font_pink_sheet_surface); + //SDL_FreeSurface(title_font_blue_sheet_surface); + //SDL_FreeSurface(title_font_pink_sheet_surface); // Load audio: // Music @@ -537,6 +537,11 @@ void Game::render_menu_title() { //TextHandler::render_text(font_title_blue, STRINGS::MENU::TITLE::HEADING_BLUE, right_x, SPRITES::SIZE, SPRITES::SPACE_WIDTH, TextHandler::CENTER_RIGHT); //TextHandler::render_text(font_title_pink, STRINGS::MENU::TITLE::HEADING_PINK, right_x + SPRITES::SIZE_HALF, SPRITES::SIZE, SPRITES::SPACE_WIDTH, TextHandler::CENTER_LEFT); + + uint8_t old_alpha = font_white.get_alpha(); + font_white.set_alpha(SPRITES::TEXT_TITLE_ALPHA); + TextHandler::render_text(font_white, STRINGS::MENU::TITLE::HEADING, right_x, SPRITES::SIZE, SPRITES::TITLE_SPACE_WIDTH); + font_white.set_alpha(old_alpha); TextHandler::render_text(option_selected == 0 ? font_selected : font_white, STRINGS::MENU::TITLE::OPTION_PLAY, left_x, WINDOW::TEXT_SCALED_HEIGHT_HALF - SPRITES::SIZE * 2, SPRITES::SPACE_WIDTH); TextHandler::render_text(option_selected == 1 ? font_selected : font_white, STRINGS::MENU::TITLE::OPTION_SETTINGS, right_x, WINDOW::TEXT_SCALED_HEIGHT_HALF, SPRITES::SPACE_WIDTH); diff --git a/Game.hpp b/Game.hpp index a1268e4..9f14177 100644 --- a/Game.hpp +++ b/Game.hpp @@ -154,7 +154,7 @@ class Game { // Fonts SDL_Texture* font_sheet_texture = NULL; - FontHandler::Font font_white, font_selected, font_highlighted, font_hint, font_title_blue, font_title_pink; + FontHandler::Font font_white, font_selected, font_highlighted, font_hint;// , font_title_blue, font_title_pink; // Input handler InputHandler input_handler; diff --git a/assets/title.png b/assets/title.png new file mode 100644 index 0000000000000000000000000000000000000000..a7b714bd2a2ffdc948d036101f87c8395fc36c4d GIT binary patch literal 1562 zcmV+#2IcvQP)Px))Ja4^RCt{2o$Za>I1Gk8hx?rZ4k_oF2+~7}Ne@AqNI5|Y*anbmV*p@0+cv;b z|JU_x^|Tui`mOR?+bz!#(SCaESL%*wsqc8|Gn)-g#Ik@7QFhs zwy6CFTK-ZS008siedANhXTm#+awT8D82(lp007|Wz{;DaMgH;l@W(Q!RbFAg7q9(Z z|1oe8!x8|%eTkUDRZLxHv_mbhhT*P002yj`mIx~Uk$Sc zb3+aQfRGGtZ^||3t$wQwS?r%N2OvVfH;2HY6951J0000000000000000Nx2pz&Oh0 zJWBS+D&Lxk_8iU zRDd&IZwb!K_8(oZ9R$*PK#12rk@8;qBhG?LgaA(5L0q8lMI-9)ZK9TaH8pfk3z~0L**_idK zajz!ddY@-;s;EbI9Vj7+_Sp9@>@B}^DBH7iPHXOu{zrnwYvPH+K<9a zzE_jwn+<2HGcyx90Pq%CbmKWXh>kMAd&?i)FZ%P@sAV{h9srJ>g^5D#Kd*kZ{WDTJ z{o*4}8yw;1y*|pXFX_Jws3cUW?U;??w>$e!(RiFq0?ds186xx_CGkStN6NvoLjN5} zmjt+F#y2T-5>&ZIZEb#pekJ?28PyeC=5^v({)fl;q^J;)~cIlDMe>|y@ z0QYjU1%NsU(0i|$r>~dg-Tn-NfEmf;r!(co)c-q{I$ZNrYZ=u1Z?XB6JrGZ-C4f@! zk)7Zjr@&{cJkjOEwC|kkV}Noz&)HoJ&pO|cWkBbzCDi~RlIXz%^nr4^9^09iv$A`+ zI}HN7`6IQr_*VICT~zp-&VM}NIRIYN+fbsnAr(diwsPy^t6dDO_GH&PdK+Pce8e`GQKM-^C3&@excyAaz0{RlU4CA& z_-|wmMy3wZYDdjS)@K_z2#oaq?DcO((k}rh6YDZHE>^Da3}8pO6>_A`8tVAB?q=|G z{>o|mnmuYe;5i`&H~e?A%3I&705}TLqu}W&-<_-3>Z zk@weskM4;0^Je|m{vN5{+kPwy34fz;4*>Q7u)lsZ<$oma)!#y71ysr_w*5rx^H$pL zW#53FeFk;>UrF9V?{f;^HJ0;2AdVpi0gcK5xO+n|v+Z7HFFSxcL;ckdz67wR+@!vOxSq(2H6panXBxuN`gSbb;BU4d(GsR4i|h#7@y z$kgy;vSl`?KQ?C1J@VF>nV