Continue adding opengl font support.
This commit is contained in:
parent
649079a5c7
commit
eef93efc29
37 changed files with 530 additions and 157 deletions
|
@ -4,17 +4,18 @@
|
|||
#include "FontsManager.h"
|
||||
#include "IFontEngine.h"
|
||||
#include "MeshPrimitives.h"
|
||||
#include "FontItem.h"
|
||||
|
||||
#include "Color.h"
|
||||
|
||||
TextNode::TextNode(const std::string& content, const DiscretePoint& loc)
|
||||
: AbstractVisualNode(loc),
|
||||
mContent(content),
|
||||
mFontLabel("fixed"),
|
||||
mFillColor(Color(255, 255, 255)),
|
||||
mStrokeColor(Color(0, 0, 0))
|
||||
: AbstractVisualNode(loc)
|
||||
{
|
||||
// https://en.wikipedia.org/wiki/Fixed_(typeface)#:~:text=misc%2Dfixed%20is%20a%20collection,to%20a%20single%20font%20family.
|
||||
mTextData.mContent = content;
|
||||
mTextData.mFont = FontItem("Arial", 16);
|
||||
mTextData.mLocation = loc;
|
||||
mTextData.mFillColor = Color(255, 255, 255);
|
||||
mTextData.mStrokeColor = Color(0, 0, 0);
|
||||
}
|
||||
|
||||
TextNode::~TextNode()
|
||||
|
@ -29,36 +30,36 @@ std::unique_ptr<TextNode> TextNode::Create(const std::string& content, const Dis
|
|||
|
||||
const Color& TextNode::getFillColor() const
|
||||
{
|
||||
return mFillColor;
|
||||
return mTextData.mFillColor;
|
||||
}
|
||||
const Color& TextNode::getStrokeColor() const
|
||||
{
|
||||
return mStrokeColor;
|
||||
return mTextData.mStrokeColor;
|
||||
}
|
||||
|
||||
std::string TextNode::getFontLabel() const
|
||||
{
|
||||
return mFontLabel;
|
||||
return {};
|
||||
}
|
||||
|
||||
std::string TextNode::getContent() const
|
||||
{
|
||||
return mContent;
|
||||
return mTextData.mContent;
|
||||
}
|
||||
|
||||
void TextNode::setContent(const std::string& content)
|
||||
{
|
||||
mContent = content;
|
||||
mTextData.mContent = content;
|
||||
}
|
||||
|
||||
void TextNode::setFillColor(const Color& color)
|
||||
{
|
||||
mFillColor = color;
|
||||
mTextData.mFillColor = color;
|
||||
}
|
||||
|
||||
void TextNode::setStrokeColor(const Color& color)
|
||||
{
|
||||
mStrokeColor = color;
|
||||
mTextData.mStrokeColor = color;
|
||||
}
|
||||
|
||||
void TextNode::update(FontsManager* drawingManager)
|
||||
|
@ -67,32 +68,17 @@ void TextNode::update(FontsManager* drawingManager)
|
|||
updateTexture(drawingManager);
|
||||
}
|
||||
|
||||
const TextData& TextNode::getTextData() const
|
||||
{
|
||||
return mTextData;
|
||||
}
|
||||
|
||||
void TextNode::updateMesh()
|
||||
{
|
||||
double font_height = 16;
|
||||
double font_width = 16;
|
||||
|
||||
double text_width = mContent.size() * font_width;
|
||||
|
||||
const auto rect = Rectangle(mLocation, text_width, font_height);
|
||||
|
||||
auto mesh = MeshPrimitives::build(rect);
|
||||
auto color = Color(0, 0, 0, 1.0);
|
||||
|
||||
mesh->addConstantFaceVectorAttribute("Color", color.getAsVectorDouble());
|
||||
mMesh = std::move(mesh);
|
||||
}
|
||||
|
||||
void TextNode::updateTexture(FontsManager* fontsManager)
|
||||
{
|
||||
fontsManager->getFontEngine()->loadFontFace("truetype/msttcorefonts/arial.ttf");
|
||||
auto glyph = fontsManager->getFontEngine()->loadGlyph('A');
|
||||
|
||||
if (!glyph)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
mTexture = std::make_unique<Image<unsigned char> >(glyph->getWidth(), glyph->getHeight());
|
||||
mTexture->setData(glyph->getData());
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue