kapitan/2dkg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Zadanie 2 - fix text, change bindings

Browse Source
This commit is contained in:
Michał Leśniak 2021-12-15 18:55:13 +01:00
parent d2556a6579
commit 03c5051212
4 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
2dgk_7/2dgk_7/KFont.cpp
View File

@ -60,4 +60,38 @@ namespace KapitanGame
}
return texture;
}
KTexture KFont::GetTextWithOutlineTexture(const std::string& text, const SDL_Color fgColor, const SDL_Color bgColor,
const int outlineSize, SDL_Renderer* renderer) const
{
KTexture texture;
const int originalOutlineSize = TTF_GetFontOutline(Font);
if (SDL_Surface* fgSurface = TTF_RenderText_Blended(Font, text.c_str(), fgColor); fgSurface == nullptr)
{
printf("Unable to render text surface! SDL_ttf Error: %s\n", TTF_GetError());
}
else
{
TTF_SetFontOutline(Font, outlineSize);
SDL_Surface* bgSurface = TTF_RenderText_Blended(Font, text.c_str(), bgColor);
TTF_SetFontOutline(Font, originalOutlineSize);
if (bgSurface == nullptr)
{
printf("Unable to render text surface! SDL_ttf Error: %s\n", TTF_GetError());
}
else
{
SDL_Rect rect = { outlineSize, outlineSize, fgSurface->w, fgSurface->h };
/* blit text onto its outline */
SDL_SetSurfaceBlendMode(fgSurface, SDL_BLENDMODE_BLEND);
SDL_BlitSurface(fgSurface, nullptr, bgSurface, &rect);
texture.LoadFromSurface(bgSurface, renderer);
SDL_FreeSurface(bgSurface);
}
SDL_FreeSurface(fgSurface);
}
return texture;
}
}

1
2dgk_7/2dgk_7/KFont.h
View File

@ -26,6 +26,7 @@ namespace KapitanGame {
void Free();
KTexture GetTextTexture(const std::string& text, SDL_Color textColor, SDL_Renderer* renderer) const;
KTexture GetTextWithOutlineTexture(const std::string& text, SDL_Color fgColor, SDL_Color bgColor, int outlineSize, SDL_Renderer* renderer) const;
private:
//The actual hardware font

6
2dgk_7/2dgk_7/KGame.cpp
View File

@ -89,7 +89,7 @@ namespace KapitanGame {
pc->UnPossess();
}
Textures.erase("Text_Score");
Textures.emplace("Text_Score", Fonts["Roboto-Thin"].GetTextTexture(Utils::StringFormat("%d:%d", Scores[0], Scores[1]), { 0,0,0,0xFF }, Renderer));
Textures.emplace("Text_Score", Fonts["Roboto-Thin"].GetTextWithOutlineTexture(Utils::StringFormat("%d:%d", Scores[0], Scores[1]), { 0xFF,0xFF,0xFF,0xFF }, { 0,0,0,0xFF }, 1, Renderer));
if (++LvlCounter > 3)
{
int max = Scores[0];
@ -236,7 +236,7 @@ namespace KapitanGame {
Fonts.erase("Roboto-Thin");
success = false;
}
Textures.emplace("Text_Score", Fonts["Roboto-Thin"].GetTextTexture("0:0", { 0,0,0,0xFF }, Renderer));
Textures.emplace("Text_Score", Fonts["Roboto-Thin"].GetTextWithOutlineTexture("0:0", { 0xFF,0xFF,0xFF,0xFF }, { 0,0,0,0xFF }, 1, Renderer));
Textures.emplace("Text_Winner", KTexture());
std::ifstream configFile("config.json");
@ -364,7 +364,7 @@ namespace KapitanGame {
Scores[static_cast<int>(i)] = 0;
}
Textures.erase("Text_Score");
Textures.emplace("Text_Score", Fonts["Roboto-Thin"].GetTextTexture(Utils::StringFormat("%d:%d", Scores[0], Scores[1]), { 0,0,0,0xFF }, Renderer));
Textures.emplace("Text_Score", Fonts["Roboto-Thin"].GetTextWithOutlineTexture(Utils::StringFormat("%d:%d", Scores[0], Scores[1]), { 0xFF,0xFF,0xFF,0xFF }, { 0,0,0,0xFF }, 1, Renderer));
ShowWinner = false;
}
Playing = true;

8
2dgk_7/2dgk_7/config.json
View File

@ -40,22 +40,22 @@
{
"AxisName": "MoveY",
"Scale": -1.000000,
"Key": "I"
"Key": "Up"
},
{
"AxisName": "MoveY",
"Scale": 1.000000,
"Key": "K"
"Key": "Down"
},
{
"AxisName": "MoveX",
"Scale": -1.000000,
"Key": "J"
"Key": "Left"
},
{
"AxisName": "MoveX",
"Scale": 1.000000,
"Key": "L"
"Key": "Right"
},
{
"AxisName": "MoveY",