GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove redundant lambda, use initializer, add nodiscard

Browse Source
This commit is contained in:
Georg Hagen
2025-01-04 01:25:04 +01:00
parent d96ced96c0
commit 207d02aab4
2 changed files with 10 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
openVulkanoCpp/Scene/TextDrawable.cpp
View File

@@ -42,27 +42,23 @@ namespace OpenVulkano::Scene
Shader TextDrawable::DEFAULT_SHADER_SDF = MakeDefaultShader("sdfText", "sdfText"); Shader TextDrawable::DEFAULT_SHADER_SDF = MakeDefaultShader("sdfText", "sdfText");
Shader TextDrawable::DEFAULT_SHADER_MSDF = MakeDefaultShader("sdfText", "msdfText"); Shader TextDrawable::DEFAULT_SHADER_MSDF = MakeDefaultShader("sdfText", "msdfText");
TextDrawable::TextDrawable(const TextConfig& config) TextDrawable::TextDrawable(const TextConfig& config) : m_cfg(config)
{ {
m_cfg = config;
m_uniBuffer.Init(sizeof(TextConfig), &m_cfg, 3); m_uniBuffer.Init(sizeof(TextConfig), &m_cfg, 3);
m_uniBuffer.binding.stageFlags = ShaderProgramType::FRAGMENT; m_uniBuffer.binding.stageFlags = ShaderProgramType::FRAGMENT;
} }
TextDrawable::TextDrawable(const Array<char>& atlasMetadata, const TextConfig& config) TextDrawable::TextDrawable(const Array<char>& atlasMetadata, const TextConfig& config)
: TextDrawable(atlasMetadata, nullptr, config) : TextDrawable(atlasMetadata, nullptr, config)
{ {}
}
TextDrawable::TextDrawable(const std::string& atlasMetadataFile, const TextConfig& config) TextDrawable::TextDrawable(const std::string& atlasMetadataFile, const TextConfig& config)
: TextDrawable(Utils::ReadFile(atlasMetadataFile), nullptr, config) : TextDrawable(Utils::ReadFile(atlasMetadataFile), nullptr, config)
{ {}
}
TextDrawable::TextDrawable(const std::string& atlasMetadataFile, Texture* atlasTex, const TextConfig& config) TextDrawable::TextDrawable(const std::string& atlasMetadataFile, Texture* atlasTex, const TextConfig& config)
: TextDrawable(Utils::ReadFile(atlasMetadataFile), atlasTex, config) : TextDrawable(Utils::ReadFile(atlasMetadataFile), atlasTex, config)
{ {}
}
TextDrawable::TextDrawable(const Array<char>& atlasMetadata, Texture* atlasTex, const TextConfig& config) TextDrawable::TextDrawable(const Array<char>& atlasMetadata, Texture* atlasTex, const TextConfig& config)
{ {
@@ -130,27 +126,11 @@ namespace OpenVulkano::Scene
void TextDrawable::GenerateText(const std::string& text, const Math::Vector3f& pos) void TextDrawable::GenerateText(const std::string& text, const Math::Vector3f& pos)
{ {
if (text.empty()) if (text.empty()) return;
{
return;
}
m_text = text; m_text = text;
auto GetActualLength = [&]()
{
auto begin = text.begin();
auto end = text.end();
size_t len = 0;
while (begin != end)
{
uint32_t c = utf8::next(begin, end);
if (c == '\n') continue;
++len;
}
return len;
};
size_t len = GetActualLength(); size_t len = utf8::distance(text.begin(), text.end());
m_geometry.Close(); m_geometry.Close();
m_geometry.Init(len * 4, len * 6); m_geometry.Init(len * 4, len * 6);
AtlasMetadata* meta; AtlasMetadata* meta;

8
openVulkanoCpp/Scene/TextDrawable.hpp
View File

@@ -16,7 +16,6 @@
namespace OpenVulkano::Scene namespace OpenVulkano::Scene
{ {
class IFontAtlasGenerator; class IFontAtlasGenerator;
struct TextConfig struct TextConfig
@@ -48,10 +47,11 @@ namespace OpenVulkano::Scene
void GenerateText(const std::string& text, const Math::Vector3f& pos = Math::Vector3f(0.f)); void GenerateText(const std::string& text, const Math::Vector3f& pos = Math::Vector3f(0.f));
void SetConfig(const TextConfig& cfg) { m_cfg = cfg; } void SetConfig(const TextConfig& cfg) { m_cfg = cfg; }
void SetAtlasData(const std::shared_ptr<AtlasData>& atlasData); void SetAtlasData(const std::shared_ptr<AtlasData>& atlasData);
Math::AABB& GetBoundingBox() { return m_bbox; } [[nodiscard]] Math::AABB& GetBoundingBox() { return m_bbox; }
TextConfig& GetConfig() { return m_cfg; } [[nodiscard]] TextConfig& GetConfig() { return m_cfg; }
[[nodiscard]] const std::string& GetText() const { return m_text; } [[nodiscard]] const std::string& GetText() const { return m_text; }
std::shared_ptr<AtlasData> GetAtlasData() { return m_atlasData; } [[nodiscard]] const std::shared_ptr<AtlasData> GetAtlasData() { return m_atlasData; }
private: private:
Geometry m_geometry; Geometry m_geometry;
Material m_material; Material m_material;