games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

Proper support for usage of multiple fonts in a chain

Browse Source
This commit is contained in:
Ivan Savenko
2024-09-24 10:41:39 +00:00
parent 557b72f2b3
commit 87274128e7
11 changed files with 284 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
client/renderSDL/RenderHandler.cpp
View File

@@ -12,8 +12,7 @@
#include "SDLImage.h"
#include "ImageScaled.h"
#include "CBitmapFont.h"
#include "CTrueTypeFont.h"
#include "FontChain.h"
#include "../gui/CGuiHandler.h"
@@ -22,8 +21,6 @@
#include "../render/Colors.h"
#include "../render/ColorFilter.h"
#include "../render/IScreenHandler.h"
#include "../../lib/CConfigHandler.h"
#include "../../lib/json/JsonUtils.h"
#include "../../lib/filesystem/Filesystem.h"
#include "../../lib/VCMIDirs.h"
@@ -345,18 +342,23 @@ std::shared_ptr<const IFont> RenderHandler::loadFont(EFonts font)
return fonts.at(font);
const int8_t index = static_cast<int8_t>(font);
const JsonNode config(JsonPath::builtin("config/fonts.json"));
const JsonVector & bmpConf = config["bitmap"].Vector();
const JsonNode & ttfConf = config["trueType"];
auto configList = CResourceHandler::get()->getResourcesWithName(JsonPath::builtin("config/fonts.json"));
std::shared_ptr<FontChain> loadedFont = std::make_shared<FontChain>();
std::string bitmapPath;
std::string filename = bmpConf[index].String();
for(auto & loader : configList)
{
auto stream = loader->load(JsonPath::builtin("config/fonts.json"));
std::unique_ptr<ui8[]> textData(new ui8[stream->getSize()]);
stream->read(textData.get(), stream->getSize());
const JsonNode config(reinterpret_cast<const std::byte*>(textData.get()), stream->getSize(), "config/fonts.json");
const JsonVector & bmpConf = config["bitmap"].Vector();
const JsonNode & ttfConf = config["trueType"];
std::shared_ptr<const IFont> loadedFont;
if(ttfConf[filename].isNull() || settings["video"]["scalableFonts"].Bool() == false)
loadedFont = std::make_shared<CBitmapFont>(filename);
else
loadedFont = std::make_shared<CTrueTypeFont>(ttfConf[filename]);
bitmapPath = bmpConf[index].String();
loadedFont->addTrueTypeFont(ttfConf[bitmapPath]);
}
loadedFont->addBitmapFont(bitmapPath);
fonts[font] = loadedFont;
return loadedFont;