Skip to content

Commit a369bf8

Browse files
borunoboruno
committed
Font fix (WIP)
1 parent 05a484f commit a369bf8

File tree

33 files changed

+59
-58
lines changed

33 files changed

+59
-58
lines changed

‎ObjectOrientedProgramming/ClassesAndObjects/AddingScore/src/dynscene.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ void GameplayDynamicScene::drawScore(sf::RenderWindow &window, unsigned int valu
153153
sf::Font font = TextureManager::getFont();
154154
text.setFont(font);
155155
text.setString("Score: " + std::to_string(value));
156-
text.setCharacterSize(24);
156+
text.setCharacterSize(20);
157157
text.setFillColor(sf::Color::White);
158-
text.setPosition(SCENE_WIDTH - 120, 0); // top right corner
158+
text.setPosition(SCENE_WIDTH - 160, 0); // top right corner
159159
window.draw(text);
160160
}
161161

‎ObjectOrientedProgramming/ClassesAndObjects/AddingScore/src/textures.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const sf::Texture* TextureManager::getTexture(GameTextureID id) const {
4343

4444
sf::Font TextureManager::getFont() {
4545
sf::Font font;
46-
if (!font.loadFromFile("resources/pixelLetters.ttf")) {
46+
if (!font.loadFromFile("resources/JetBrainsMono-Light.ttf")) {
4747
std::cerr << "Could not load font\n";
4848
}
4949
return font;

‎ObjectOrientedProgramming/ClassesAndObjects/CollisionsRevisited/src/dynscene.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ void GameplayDynamicScene::drawScore(sf::RenderWindow &window, unsigned int valu
153153
sf::Font font = TextureManager::getFont();
154154
text.setFont(font);
155155
text.setString("Score: " + std::to_string(value));
156-
text.setCharacterSize(24);
156+
text.setCharacterSize(20);
157157
text.setFillColor(sf::Color::White);
158-
text.setPosition(SCENE_WIDTH - 120, 0); // top right corner
158+
text.setPosition(SCENE_WIDTH - 160, 0); // top right corner
159159
window.draw(text);
160160
}
161161

‎ObjectOrientedProgramming/ClassesAndObjects/CollisionsRevisited/src/textures.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const sf::Texture* TextureManager::getTexture(GameTextureID id) const {
4343

4444
sf::Font TextureManager::getFont() {
4545
sf::Font font;
46-
if (!font.loadFromFile("resources/pixelLetters.ttf")) {
46+
if (!font.loadFromFile("resources/JetBrainsMono-Light.ttf")) {
4747
std::cerr << "Could not load font\n";
4848
}
4949
return font;

‎ObjectOrientedProgramming/ClassesAndObjects/DataRetrieval/src/dynscene.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ void GameplayDynamicScene::drawScore(sf::RenderWindow &window, unsigned int valu
153153
sf::Font font = TextureManager::getFont();
154154
text.setFont(font);
155155
text.setString("Score: " + std::to_string(value));
156-
text.setCharacterSize(24);
156+
text.setCharacterSize(20);
157157
text.setFillColor(sf::Color::White);
158-
text.setPosition(SCENE_WIDTH - 120, 0); // top right corner
158+
text.setPosition(SCENE_WIDTH - 160, 0); // top right corner
159159
window.draw(text);
160160
}
161161

‎ObjectOrientedProgramming/ClassesAndObjects/DataRetrieval/src/textures.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const sf::Texture* TextureManager::getTexture(GameTextureID id) const {
4343

4444
sf::Font TextureManager::getFont() {
4545
sf::Font font;
46-
if (!font.loadFromFile("resources/pixelLetters.ttf")) {
46+
if (!font.loadFromFile("resources/JetBrainsMono-Light.ttf")) {
4747
std::cerr << "Could not load font\n";
4848
}
4949
return font;

‎ObjectOrientedProgramming/ClassesAndObjects/Encapsulation/src/dynscene.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ void GameplayDynamicScene::drawScore(sf::RenderWindow &window, unsigned int valu
153153
sf::Font font = TextureManager::getFont();
154154
text.setFont(font);
155155
text.setString("Score: " + std::to_string(value));
156-
text.setCharacterSize(24);
156+
text.setCharacterSize(20);
157157
text.setFillColor(sf::Color::White);
158-
text.setPosition(SCENE_WIDTH - 120, 0); // top right corner
158+
text.setPosition(SCENE_WIDTH - 160, 0); // top right corner
159159
window.draw(text);
160160
}
161161

‎ObjectOrientedProgramming/ClassesAndObjects/Encapsulation/src/textures.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const sf::Texture* TextureManager::getTexture(GameTextureID id) const {
4343

4444
sf::Font TextureManager::getFont() {
4545
sf::Font font;
46-
if (!font.loadFromFile("resources/pixelLetters.ttf")) {
46+
if (!font.loadFromFile("resources/JetBrainsMono-Light.ttf")) {
4747
std::cerr << "Could not load font\n";
4848
}
4949
return font;

‎ObjectOrientedProgramming/ClassesAndObjects/Inheritance/src/dynscene.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ void GameplayDynamicScene::drawScore(sf::RenderWindow &window, unsigned int valu
153153
sf::Font font = TextureManager::getFont();
154154
text.setFont(font);
155155
text.setString("Score: " + std::to_string(value));
156-
text.setCharacterSize(24);
156+
text.setCharacterSize(20);
157157
text.setFillColor(sf::Color::White);
158-
text.setPosition(SCENE_WIDTH - 120, 0); // top right corner
158+
text.setPosition(SCENE_WIDTH - 160, 0); // top right corner
159159
window.draw(text);
160160
}
161161

‎ObjectOrientedProgramming/ClassesAndObjects/Inheritance/src/textures.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const sf::Texture* TextureManager::getTexture(GameTextureID id) const {
4343

4444
sf::Font TextureManager::getFont() {
4545
sf::Font font;
46-
if (!font.loadFromFile("resources/pixelLetters.ttf")) {
46+
if (!font.loadFromFile("resources/JetBrainsMono-Light.ttf")) {
4747
std::cerr << "Could not load font\n";
4848
}
4949
return font;

‎ObjectOrientedProgramming/ClassesAndObjects/IntroducingObjects/src/dynscene.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ void GameplayDynamicScene::drawScore(sf::RenderWindow &window, unsigned int valu
153153
sf::Font font = TextureManager::getFont();
154154
text.setFont(font);
155155
text.setString("Score: " + std::to_string(value));
156-
text.setCharacterSize(24);
156+
text.setCharacterSize(20);
157157
text.setFillColor(sf::Color::White);
158-
text.setPosition(SCENE_WIDTH - 120, 0); // top right corner
158+
text.setPosition(SCENE_WIDTH - 160, 0); // top right corner
159159
window.draw(text);
160160
}
161161

‎ObjectOrientedProgramming/ClassesAndObjects/IntroducingObjects/src/textures.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const sf::Texture* TextureManager::getTexture(GameTextureID id) const {
4343

4444
sf::Font TextureManager::getFont() {
4545
sf::Font font;
46-
if (!font.loadFromFile("resources/pixelLetters.ttf")) {
46+
if (!font.loadFromFile("resources/JetBrainsMono-Light.ttf")) {
4747
std::cerr << "Could not load font\n";
4848
}
4949
return font;

‎ObjectOrientedProgramming/ClassesAndObjects/Introduction/src/dynscene.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ void GameplayDynamicScene::drawScore(sf::RenderWindow &window, unsigned int valu
153153
sf::Font font = TextureManager::getFont();
154154
text.setFont(font);
155155
text.setString("Score: " + std::to_string(value));
156-
text.setCharacterSize(24);
156+
text.setCharacterSize(20);
157157
text.setFillColor(sf::Color::White);
158-
text.setPosition(SCENE_WIDTH - 120, 0); // top right corner
158+
text.setPosition(SCENE_WIDTH - 160, 0); // top right corner
159159
window.draw(text);
160160
}
161161

‎ObjectOrientedProgramming/ClassesAndObjects/Introduction/src/textures.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const sf::Texture* TextureManager::getTexture(GameTextureID id) const {
4343

4444
sf::Font TextureManager::getFont() {
4545
sf::Font font;
46-
if (!font.loadFromFile("resources/pixelLetters.ttf")) {
46+
if (!font.loadFromFile("resources/JetBrainsMono-Light.ttf")) {
4747
std::cerr << "Could not load font\n";
4848
}
4949
return font;

‎ObjectOrientedProgramming/ClassesAndObjects/NameInput/src/dynscene.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ void GameplayDynamicScene::drawScore(sf::RenderWindow &window, unsigned int valu
153153
sf::Font font = TextureManager::getFont();
154154
text.setFont(font);
155155
text.setString("Score: " + std::to_string(value));
156-
text.setCharacterSize(24);
156+
text.setCharacterSize(20);
157157
text.setFillColor(sf::Color::White);
158-
text.setPosition(SCENE_WIDTH - 120, 0); // top right corner
158+
text.setPosition(SCENE_WIDTH - 160, 0); // top right corner
159159
window.draw(text);
160160
}
161161

‎ObjectOrientedProgramming/ClassesAndObjects/NameInput/src/textures.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const sf::Texture* TextureManager::getTexture(GameTextureID id) const {
4343

4444
sf::Font TextureManager::getFont() {
4545
sf::Font font;
46-
if (!font.loadFromFile("resources/pixelLetters.ttf")) {
46+
if (!font.loadFromFile("resources/JetBrainsMono-Light.ttf")) {
4747
std::cerr << "Could not load font\n";
4848
}
4949
return font;

‎ObjectOrientedProgramming/ClassesAndObjects/NewChallenge/src/dynscene.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ void GameplayDynamicScene::drawScore(sf::RenderWindow &window, unsigned int valu
153153
sf::Font font = TextureManager::getFont();
154154
text.setFont(font);
155155
text.setString("Score: " + std::to_string(value));
156-
text.setCharacterSize(24);
156+
text.setCharacterSize(20);
157157
text.setFillColor(sf::Color::White);
158-
text.setPosition(SCENE_WIDTH - 120, 0); // top right corner
158+
text.setPosition(SCENE_WIDTH - 160, 0); // top right corner
159159
window.draw(text);
160160
}
161161

‎ObjectOrientedProgramming/ClassesAndObjects/NewChallenge/src/textures.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const sf::Texture* TextureManager::getTexture(GameTextureID id) const {
4343

4444
sf::Font TextureManager::getFont() {
4545
sf::Font font;
46-
if (!font.loadFromFile("resources/pixelLetters.ttf")) {
46+
if (!font.loadFromFile("resources/JetBrainsMono-Light.ttf")) {
4747
std::cerr << "Could not load font\n";
4848
}
4949
return font;

‎ObjectOrientedProgramming/ClassesAndObjects/NewDynamics/src/dynscene.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ void GameplayDynamicScene::drawScore(sf::RenderWindow &window, unsigned int valu
153153
sf::Font font = TextureManager::getFont();
154154
text.setFont(font);
155155
text.setString("Score: " + std::to_string(value));
156-
text.setCharacterSize(24);
156+
text.setCharacterSize(20);
157157
text.setFillColor(sf::Color::White);
158-
text.setPosition(SCENE_WIDTH - 120, 0); // top right corner
158+
text.setPosition(SCENE_WIDTH - 160, 0); // top right corner
159159
window.draw(text);
160160
}
161161

‎ObjectOrientedProgramming/ClassesAndObjects/NewDynamics/src/textures.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const sf::Texture* TextureManager::getTexture(GameTextureID id) const {
4343

4444
sf::Font TextureManager::getFont() {
4545
sf::Font font;
46-
if (!font.loadFromFile("resources/pixelLetters.ttf")) {
46+
if (!font.loadFromFile("resources/JetBrainsMono-Light.ttf")) {
4747
std::cerr << "Could not load font\n";
4848
}
4949
return font;

‎ObjectOrientedProgramming/ClassesAndObjects/OperatorsOverloading/src/dynscene.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ void GameplayDynamicScene::drawScore(sf::RenderWindow &window, unsigned int valu
153153
sf::Font font = TextureManager::getFont();
154154
text.setFont(font);
155155
text.setString("Score: " + std::to_string(value));
156-
text.setCharacterSize(24);
156+
text.setCharacterSize(20);
157157
text.setFillColor(sf::Color::White);
158-
text.setPosition(SCENE_WIDTH - 120, 0); // top right corner
158+
text.setPosition(SCENE_WIDTH - 160, 0); // top right corner
159159
window.draw(text);
160160
}
161161

‎ObjectOrientedProgramming/ClassesAndObjects/OperatorsOverloading/src/textures.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const sf::Texture* TextureManager::getTexture(GameTextureID id) const {
4343

4444
sf::Font TextureManager::getFont() {
4545
sf::Font font;
46-
if (!font.loadFromFile("resources/pixelLetters.ttf")) {
46+
if (!font.loadFromFile("resources/JetBrainsMono-Light.ttf")) {
4747
std::cerr << "Could not load font\n";
4848
}
4949
return font;

‎ObjectOrientedProgramming/ClassesAndObjects/Polymorphism/src/dynscene.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ void GameplayDynamicScene::drawScore(sf::RenderWindow &window, unsigned int valu
153153
sf::Font font = TextureManager::getFont();
154154
text.setFont(font);
155155
text.setString("Score: " + std::to_string(value));
156-
text.setCharacterSize(24);
156+
text.setCharacterSize(20);
157157
text.setFillColor(sf::Color::White);
158-
text.setPosition(SCENE_WIDTH - 120, 0); // top right corner
158+
text.setPosition(SCENE_WIDTH - 160, 0); // top right corner
159159
window.draw(text);
160160
}
161161

‎ObjectOrientedProgramming/ClassesAndObjects/Polymorphism/src/textures.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const sf::Texture* TextureManager::getTexture(GameTextureID id) const {
4343

4444
sf::Font TextureManager::getFont() {
4545
sf::Font font;
46-
if (!font.loadFromFile("resources/pixelLetters.ttf")) {
46+
if (!font.loadFromFile("resources/JetBrainsMono-Light.ttf")) {
4747
std::cerr << "Could not load font\n";
4848
}
4949
return font;

‎ObjectOrientedProgramming/ClassesAndObjects/SceneTransition/src/dynscene.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,9 @@ void GameplayDynamicScene::drawScore(sf::RenderWindow &window, unsigned int valu
155155
sf::Font font = TextureManager::getFont();
156156
text.setFont(font);
157157
text.setString("Score: " + std::to_string(value));
158-
text.setCharacterSize(24);
158+
text.setCharacterSize(20);
159159
text.setFillColor(sf::Color::White);
160-
text.setPosition(SCENE_WIDTH - 120, 0); // top right corner
160+
text.setPosition(SCENE_WIDTH - 160, 0); // top right corner
161161
window.draw(text);
162162
}
163163

‎ObjectOrientedProgramming/ClassesAndObjects/SceneTransition/src/textures.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const sf::Texture* TextureManager::getTexture(GameTextureID id) const {
4343

4444
sf::Font TextureManager::getFont() {
4545
sf::Font font;
46-
if (!font.loadFromFile("resources/pixelLetters.ttf")) {
46+
if (!font.loadFromFile("resources/JetBrainsMono-Light.ttf")) {
4747
std::cerr << "Could not load font\n";
4848
}
4949
return font;

‎ObjectOrientedProgramming/ClassesAndObjects/Scoreboard/src/dynscene.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ void GameplayDynamicScene::drawScore(sf::RenderWindow &window, unsigned int valu
153153
sf::Font font = TextureManager::getFont();
154154
text.setFont(font);
155155
text.setString("Score: " + std::to_string(value));
156-
text.setCharacterSize(24);
156+
text.setCharacterSize(20);
157157
text.setFillColor(sf::Color::White);
158-
text.setPosition(SCENE_WIDTH - 120, 0); // top right corner
158+
text.setPosition(SCENE_WIDTH - 160, 0); // top right corner
159159
window.draw(text);
160160
}
161161

‎ObjectOrientedProgramming/ClassesAndObjects/Scoreboard/src/textures.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const sf::Texture* TextureManager::getTexture(GameTextureID id) const {
4343

4444
sf::Font TextureManager::getFont() {
4545
sf::Font font;
46-
if (!font.loadFromFile("resources/pixelLetters.ttf")) {
46+
if (!font.loadFromFile("resources/JetBrainsMono-Light.ttf")) {
4747
std::cerr << "Could not load font\n";
4848
}
4949
return font;

‎ObjectOrientedProgramming/ClassesAndObjects/StaticMembers/src/dynscene.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ void GameplayDynamicScene::drawScore(sf::RenderWindow &window, unsigned int valu
153153
sf::Font font = TextureManager::getFont();
154154
text.setFont(font);
155155
text.setString("Score: " + std::to_string(value));
156-
text.setCharacterSize(24);
156+
text.setCharacterSize(20);
157157
text.setFillColor(sf::Color::White);
158-
text.setPosition(SCENE_WIDTH - 120, 0); // top right corner
158+
text.setPosition(SCENE_WIDTH - 160, 0); // top right corner
159159
window.draw(text);
160160
}
161161

‎ObjectOrientedProgramming/ClassesAndObjects/StaticMembers/src/textures.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const sf::Texture* TextureManager::getTexture(GameTextureID id) const {
4343

4444
sf::Font TextureManager::getFont() {
4545
sf::Font font;
46-
if (!font.loadFromFile("resources/pixelLetters.ttf")) {
46+
if (!font.loadFromFile("resources/JetBrainsMono-Light.ttf")) {
4747
std::cerr << "Could not load font\n";
4848
}
4949
return font;

‎include/constants.hpp

+14-13
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,19 @@ const float MAX_PLAYER_NAME_LENGTH = 16.0f;
4040

4141
const float MAX_LINES = 10.0f;
4242

43-
const unsigned int HEADER_FONT_SIZE = 40;
44-
const float HEADER_X = 300.0f;
43+
const unsigned int HEADER_FONT_SIZE = 36;
44+
const float HEADER_X = 280.0f;
4545
const float HEADER_Y = 40.0f;
4646

47-
const unsigned int LEADERBOARD_FONT_SIZE = 26;
48-
const float POS_HEADER_X = 108.0f;
49-
const float POS_HEADER_Y = HEADER_Y + 61.0f;
50-
const float NAME_HEADER_X = 330.0f;
51-
const float NAME_HEADER_Y = HEADER_Y + 61.0f;
52-
const float SCORE_HEADER_X = 593.0f;
53-
const float SCORE_HEADER_Y = HEADER_Y + 61.0f;
47+
const unsigned int LEADERBOARD_FONT_SIZE = 22;
48+
const float POS_HEADER_X = 106.0f;
49+
const float POS_HEADER_Y = HEADER_Y + 65.0f;
50+
const float NAME_HEADER_X = 320.0f;
51+
const float NAME_HEADER_Y = HEADER_Y + 65.0f;
52+
const float SCORE_HEADER_X = 592.0f;
53+
const float SCORE_HEADER_Y = HEADER_Y + 65.0f;
5454

55-
const float PADDING = 8.0f;
55+
const float PADDING = 8.5f;
5656
const float LEADERBOARD_WIDTH = 600.0f;
5757
const float ROW_HEIGHT = LEADERBOARD_FONT_SIZE + PADDING * 2.0f;
5858
const float LEADERBOARD_X = SCENE_WIDTH / 2.0f - LEADERBOARD_WIDTH / 2.0f;
@@ -62,9 +62,10 @@ const float ONE_DIGIT_POS_OFFSET = 14.0f;
6262
const float TWO_DIGIT_POS_OFFSET = 19.0f;
6363
const float NAME_X_OFFSET = 60.0f;
6464
const float ONE_DIGIT_SCORE_OFFSET = 520.0f;
65-
const float FOUR_DIGIT_SCORE_OFFSET = 505.0f;
66-
const float FIVE_DIGIT_SCORE_OFFSET = 500.0f;
65+
const float SCORE_X_OFFSET_DIFF = 9.0f;
66+
const float FOUR_DIGIT_SCORE_OFFSET = ONE_DIGIT_SCORE_OFFSET - SCORE_X_OFFSET_DIFF * 2;
67+
const float FIVE_DIGIT_SCORE_OFFSET = ONE_DIGIT_SCORE_OFFSET - SCORE_X_OFFSET_DIFF * 3;
6768

68-
const float BORDER_OFFSET = 3.0f;
69+
const float BORDER_OFFSET = 6.0f;
6970

7071
#endif // CPPBASICS_CONSTANTS_HPP

‎resources/JetBrainsMono-Light.ttf

270 KB
Binary file not shown.

‎resources/pixelLetters.ttf

-10.1 KB
Binary file not shown.

0 commit comments

Comments
 (0)