blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 18:40:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Preload font resources

Browse source
This commit is contained in:
Dan Paulat 2021-10-23 09:03:54 -05:00
parent 6ff4718ef4
commit 28ea12cbfe
7 changed files with 53 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
scwx-qt/res/fonts/din1451alt_g.ttf Normal file
View file

Binary file not shown.

6
scwx-qt/scwx-qt.cmake
View file

@ -57,8 +57,10 @@ set(HDR_GL source/scwx/qt/gl/gl.hpp
source/scwx/qt/gl/text_shader.hpp)
set(SRC_GL source/scwx/qt/gl/shader_program.cpp
source/scwx/qt/gl/text_shader.cpp)
set(HDR_MANAGER source/scwx/qt/manager/radar_manager.hpp)
set(SRC_MANAGER source/scwx/qt/manager/radar_manager.cpp)
set(HDR_MANAGER source/scwx/qt/manager/radar_manager.hpp
source/scwx/qt/manager/resource_manager.hpp)
set(SRC_MANAGER source/scwx/qt/manager/radar_manager.cpp
source/scwx/qt/manager/resource_manager.cpp)
set(HDR_MAP source/scwx/qt/map/map_widget.hpp
source/scwx/qt/map/overlay_layer.hpp
source/scwx/qt/map/radar_layer.hpp

1
scwx-qt/scwx-qt.qrc
View file

@ -7,5 +7,6 @@
<file>gl/text.frag</file>
<file>gl/text.vert</file>
<file>res/fonts/din1451alt.ttf</file>
<file>res/fonts/din1451alt_g.ttf</file>
</qresource>
</RCC>

5
scwx-qt/source/scwx/qt/main/main.cpp
View file

@ -1,4 +1,5 @@
#include "main_window.hpp"
#include <scwx/qt/main/main_window.hpp>
#include <scwx/qt/manager/resource_manager.hpp>
#include <boost/log/expressions.hpp>
#include <boost/log/trivial.hpp>
@ -9,6 +10,8 @@ int main(int argc, char* argv[])
boost::log::core::get()->set_filter(boost::log::trivial::severity >=
boost::log::trivial::debug);
scwx::qt::manager::ResourceManager::PreLoad();
QApplication a(argc, argv);
scwx::qt::main::MainWindow w;
w.show();

28
scwx-qt/source/scwx/qt/manager/resource_manager.cpp Normal file
View file

@ -0,0 +1,28 @@
#include <scwx/qt/manager/resource_manager.hpp>
#include <scwx/qt/util/font.hpp>
namespace scwx
{
namespace qt
{
namespace manager
{
namespace ResourceManager
{
static void LoadFonts();
void PreLoad()
{
LoadFonts();
}
static void LoadFonts()
{
util::Font::Create(":/res/fonts/din1451alt.ttf");
util::Font::Create(":/res/fonts/din1451alt_g.ttf");
}
} // namespace ResourceManager
} // namespace manager
} // namespace qt
} // namespace scwx

15
scwx-qt/source/scwx/qt/manager/resource_manager.hpp Normal file
View file

@ -0,0 +1,15 @@
#pragma once
namespace scwx
{
namespace qt
{
namespace manager
{
namespace ResourceManager
{
void PreLoad();
} // namespace ResourceManager
} // namespace manager
} // namespace qt
} // namespace scwx

1
scwx-qt/source/scwx/qt/util/font.cpp
View file

@ -250,6 +250,7 @@ std::shared_ptr<Font> Font::Create(const std::string& resource)
auto it = fontMap_.find(resource);
if (it != fontMap_.end())
{
BOOST_LOG_TRIVIAL(debug) << logPrefix_ << "Font already created";
return it->second;
}