YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed old TrueType

Browse Source
This commit is contained in:
Dominic Masters
2023-06-16 10:46:41 -07:00
parent 4f757c2ea9
commit 2964aa4a95
22 changed files with 455 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/dawn/scene/components/ui/text/UILabel.hpp
View File

@ -6,7 +6,7 @@
#pragma once
#include "scene/components/ui/UIComponentRenderable.hpp"
#include "display/mesh/QuadMesh.hpp"
#include "asset/assets/NewTrueTypeAsset.hpp"
#include "asset/assets/TrueTypeAsset.hpp"
#include "util/Xml.hpp"
#define UI_LABEL_MAX_WIDTH_NONE -1
@ -16,7 +16,7 @@ namespace Dawn {
struct Color color = COLOR_WHITE;
flag_t style = 0;
uint32_t size = 16;
NewTrueTypeAsset *font = nullptr;
TrueTypeAsset *font = nullptr;
};
struct UILabelText {
@ -25,7 +25,7 @@ namespace Dawn {
int32_t lineStart = 0;
int32_t lineCount = 0;
usagelockid_t lockId = -1;
struct NewTrueTypeFaceTexture *texture = nullptr;
struct TrueTypeFaceTexture *texture = nullptr;
};
struct UILabelLine {
@ -38,13 +38,13 @@ namespace Dawn {
private:
Mesh mesh;
FontShaderBuffer shaderBuffer;
std::map<NewTrueTypeFaceTexture*, int32_t> textureMap;
std::map<TrueTypeFaceTexture*, int32_t> textureMap;
public:
int32_t quadStart = 0;
int32_t quadCount = -1;
int32_t quadCountTotal = -1;
std::vector<struct UILabelText> texts;
std::vector<struct UILabelText> textsBuffered;
std::vector<struct UILabelLine> lines;