Skip to content

Commit

Permalink
Added title text.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ThePythonator
ThePythonator committed Mar 1, 2022
1 parent 76825f7 commit f366d73
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 11 deletions.
8 changes: 6 additions & 2 deletions Constants.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";

Expand Down
8 changes: 6 additions & 2 deletions Constants.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down
17 changes: 11 additions & 6 deletions Game.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion Game.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Binary file added assets/title.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit f366d73

Please sign in to comment.