VKVM
/
Text-Renderer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
@Nurullah.Damla 2020-01-08 13:14:12 +01:00
parent 07a794ea69 5858f5c4c3
commit 8876e04c15
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main/main.cpp
View File

@ -47,7 +47,12 @@ int main() {
vkvm::initialize(0); vkvm::initialize(0);
vkvm::setLogLevel(vkvm::DEBUG); vkvm::setLogLevel(vkvm::DEBUG);
Font font(std::string() + "../res/font" + std::to_string(vkvm::getFont()) + ".bmp", std::string() + "../res/font" + std::to_string(vkvm::getFont()) + ".toml"); Font font(
std::string() + "../res/font" +
std::to_string(static_cast<int>(vkvm::getFont())) + ".bmp",
std::string() + "../res/font" +
std::to_string(static_cast<int>(vkvm::getFont())) + ".toml");
std::thread thread(std::bind(threadHandler, font)); std::thread thread(std::bind(threadHandler, font));
vkvm::registerEvent(vkvm::EventType::RenderText, [&font]() { vkvm::registerEvent(vkvm::EventType::RenderText, [&font]() {
@ -98,7 +103,11 @@ int main() {
}); });
vkvm::registerEvent(vkvm::EventType::UpdateControlRegisters, [&font]() { vkvm::registerEvent(vkvm::EventType::UpdateControlRegisters, [&font]() {
font.load(std::string() + "../res/font" + std::to_string(vkvm::getFont()) + ".bmp", std::string() + "../res/font" + std::to_string(vkvm::getFont()) + ".toml"); font.load(
std::string() + "../res/font" +
std::to_string(static_cast<int>(vkvm::getFont())) + ".bmp",
std::string() + "../res/font" +
std::to_string(static_cast<int>(vkvm::getFont())) + ".toml");
}); });
while (true) { while (true) {