aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2021-06-13 04:21:35 +0200
committerdec05eba <dec05eba@protonmail.com>2021-06-13 04:21:35 +0200
commitf51a76e6febb27923e3ca8e853974a24465c4739 (patch)
tree03eda2424e5ec20d076e057ee55a04756f005e08 /include
parentc7e10b0910473c99dbc139f514220b134093c9f0 (diff)
Support braille, temporary disable video cache to support seeking in long videos on youtube...
Diffstat (limited to 'include')
-rw-r--r--include/ResourceLoader.hpp3
-rw-r--r--include/Text.hpp8
2 files changed, 5 insertions, 6 deletions
diff --git a/include/ResourceLoader.hpp b/include/ResourceLoader.hpp
index a778f18..29efa91 100644
--- a/include/ResourceLoader.hpp
+++ b/include/ResourceLoader.hpp
@@ -14,7 +14,8 @@ namespace QuickMedia::FontLoader {
enum class FontType {
LATIN,
LATIN_BOLD,
- CJK
+ CJK,
+ SYMBOLS
};
// Note: not thread-safe
diff --git a/include/Text.hpp b/include/Text.hpp
index a39b2ba..72fdd66 100644
--- a/include/Text.hpp
+++ b/include/Text.hpp
@@ -42,6 +42,7 @@ namespace QuickMedia
enum class TextType {
LATIN,
CJK,
+ SYMBOL,
EMOJI
};
@@ -146,11 +147,8 @@ namespace QuickMedia
sf::String str; // TODO: Remove this for non-editable text??? also replace with std::string? then we get more efficient editing of text
const bool bold_font;
unsigned int characterSize;
- // 1: Normal text
- // 2: CJK
- // 3: Emoji
- std::array<sf::VertexArray, 3> vertices;
- std::array<sf::VertexBuffer, 3> vertex_buffers;
+ std::array<sf::VertexArray, 4> vertices;
+ std::array<sf::VertexBuffer, 4> vertex_buffers;
float maxWidth;
sf::Vector2f position;
sf::Color color;