Add Keyboard input and enter support for text editor.

This commit is contained in:
James Grogan 2022-11-17 13:13:01 +00:00
parent cf9bace272
commit 9301769d58
23 changed files with 315 additions and 121 deletions

View file

@ -15,11 +15,11 @@ const TextData& SceneText::getTextData() const
return mTextData;
}
void SceneText::setContent(const std::string& content)
void SceneText::setTextData(const TextData& data)
{
if (mTextData.mContent != content)
if (mTextData != data)
{
mTextGeometryIsDirty = true;
mTextData.mContent = content;
mTextData = data;
}
}

View file

@ -12,7 +12,7 @@ public:
const TextData& getTextData() const;
void setContent(const std::string& content);
void setTextData(const TextData& content);
private:
bool mTextGeometryIsDirty{true};

View file

@ -3,10 +3,27 @@
#include "Color.h"
#include "FontItem.h"
#include <vector>
class TextData
{
public:
bool operator==(const TextData& rhs) const
{
return (mContent == rhs.mContent)
&& (mLines == rhs.mLines)
&& (mFont == rhs.mFont);
}
bool operator!=(const TextData& rhs) const
{
return !operator==(rhs);
}
public:
TextData() = default;
std::string mContent;
std::vector<std::string> mLines;
FontItem mFont;
};

View file

@ -5,17 +5,20 @@
#include "IFontEngine.h"
#include "MeshPrimitives.h"
#include "FontItem.h"
#include "FontGlyph.h"
#include "SceneText.h"
#include "Color.h"
#include "StringUtils.h"
#include <iostream>
TextNode::TextNode(const std::string& content, const DiscretePoint& loc)
: MaterialNode(loc)
{
mContent= content;
mTextData.mContent= content;
}
TextNode::~TextNode()
@ -35,18 +38,82 @@ std::string TextNode::getFontLabel() const
std::string TextNode::getContent() const
{
return mContent;
return mTextData.mContent;
}
unsigned TextNode::getWidth() const
{
return mWidth;
}
unsigned TextNode::getHeight() const
{
return mHeight;
}
void TextNode::setWidth(unsigned width)
{
if (mWidth != width)
{
mTransformIsDirty = true;
mWidth = width;
}
}
void TextNode::setHeight(unsigned height)
{
if (mHeight != height)
{
mTransformIsDirty = true;
mHeight = height;
}
}
void TextNode::setContent(const std::string& content)
{
if (mContent != content)
if (mTextData.mContent != content)
{
mContent = content;
mTextData.mContent = content;
mContentIsDirty = true;
}
}
void TextNode::updateLines(FontsManager* fontsManager)
{
auto original_count = mTextData.mLines.size();
std::vector<std::string> lines = StringUtils::toLines(mTextData.mContent);
std::vector<std::string> output_lines;
for (auto line : lines)
{
double running_width{0};
std::string working_line;
for (auto c : line)
{
auto glyph_advance = fontsManager->getGlyph(mTextData.mFont.getFaceName(), mTextData.mFont.getSize(), c)->getAdvanceX();
if (false)
//if (running_width + glyph_advance > mWidth)
{
output_lines.push_back(working_line);
working_line = c;
running_width = glyph_advance;
}
else
{
working_line += c;
running_width += glyph_advance;
}
}
output_lines.push_back(working_line);
running_width = 0;
}
mTextData.mLines = output_lines;
if (original_count != mTextData.mLines.size())
{
mLinesAreDirty = true;
}
}
void TextNode::update(FontsManager* fontsManager)
{
if (!mSceneItem)
@ -55,10 +122,16 @@ void TextNode::update(FontsManager* fontsManager)
mSceneItem->setName(mName + "_SceneText");
}
if (mContentIsDirty)
if (mTransformIsDirty || mContentIsDirty)
{
dynamic_cast<SceneText*>(mSceneItem.get())->setContent(mContent);
updateLines(fontsManager);
}
if (mContentIsDirty || mLinesAreDirty)
{
dynamic_cast<SceneText*>(mSceneItem.get())->setTextData(mTextData);
mContentIsDirty = false;
mLinesAreDirty = false;
}
if (mTransformIsDirty)

View file

@ -20,12 +20,25 @@ public:
std::string getContent() const;
std::string getFontLabel() const;
unsigned getWidth() const;
unsigned getHeight() const;
void setWidth(unsigned width);
void setHeight(unsigned height);
void setContent(const std::string& content);
void update(FontsManager* fontsManager) override;
private:
std::string mContent;
void updateLines(FontsManager* fontsManager);
TextData mTextData;
bool mContentIsDirty{true};
bool mLinesAreDirty{true};
unsigned mWidth{1};
unsigned mHeight{1};
};
using TextNodetr = std::unique_ptr<TextNode>;