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

rework label drawable and text drawable's API

Browse Source
This commit is contained in:
ohyzha
2024-08-26 17:42:43 +03:00
parent a2923966fa
commit e2ae1687ac
13 changed files with 160 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
openVulkanoCpp/Scene/Prefabs/LabelDrawable.cpp
View File

@@ -15,9 +15,15 @@ namespace OpenVulkano::Scene
{
using namespace Math;
LabelDrawable::LabelDrawable(const LabelDrawableSettings& settings, bool isBillboard)
LabelDrawable::LabelDrawable(const std::shared_ptr<AtlasData>& atlasData, const LabelDrawableSettings& settings,
bool isBillboard)
: Drawable(DrawEncoder::GetDrawEncoder<LabelDrawable>(), DrawPhase::MAIN)
{
if (atlasData->glyphs.empty() || !atlasData->texture.size)
{
throw std::runtime_error("Can't create label drawable. Either glyphs or texture is empty");
}
m_atlasData = atlasData;
m_isBillboard = isBillboard;
SetLabelSettings(settings);
SetupShaders();
@@ -34,40 +40,19 @@ namespace OpenVulkano::Scene
m_labelData.arrowLength = settings.arrowLength;
}
void LabelDrawable::AddText(TextDrawable* td, const std::string& text)
void LabelDrawable::AddText(const std::string& text, const TextConfig& config)
{
if (!td || text.empty())
if (text.empty())
{
return;
}
if (!td->GetShader())
{
Logger::RENDER->error("Text drawable shader is null, cannot add text to label drawable\n");
return;
}
TextDrawable& textDrawable = m_texts.emplace_back(td->GetConfig());
// do not render glyph's background
TextDrawable& textDrawable = m_texts.emplace_back(m_atlasData, config);
textDrawable.GetConfig().backgroundColor.a = 0;
if (m_isBillboard)
{
textDrawable.SetShader(GetBillboardTextShader(td->GetShader()));
}
else
{
textDrawable.SetShader(td->GetShader());
}
double lineHeight;
if (textDrawable.GetFontAtlasGenerator())
{
textDrawable.SetFontAtlasGenerator(td->GetFontAtlasGenerator());
lineHeight = td->GetFontAtlasGenerator()->GetAtlasMetadata().lineHeight;
}
else
{
textDrawable.SetAtlasData(td->GetAtlasData());
lineHeight = td->GetAtlasData()->meta.lineHeight;
}
textDrawable.SetShader(&m_textShader);
double lineHeight = m_atlasData->meta.lineHeight;
textDrawable.GenerateText(text, m_position);
RecalculateBbox(textDrawable.GetBoundingBox());
// update position for next text entry
@@ -163,59 +148,6 @@ namespace OpenVulkano::Scene
}
}
// if we have want our label to be billboard, then we'll create new shader and set it's vertex shader to billboard.vert
// to avoid modifying input shader
Shader* LabelDrawable::GetBillboardTextShader(Shader* src)
{
auto GetFragmentShaderName = [](const Shader& shaderToCheck) -> std::optional<std::string>
{
const auto& shaderPrograms = shaderToCheck.shaderPrograms;
auto pos = std::find_if(shaderPrograms.begin(), shaderPrograms.end(),
[](const ShaderProgram& program)
{ return program.type == ShaderProgramType::FRAGMENT; });
return pos != shaderPrograms.end() ? std::optional<std::string>(pos->name) : std::nullopt;
};
std::optional<std::string> inputFragmentName = GetFragmentShaderName(*src);
if (!inputFragmentName)
{
throw std::runtime_error("Shader doesn't have fragment program");
}
bool exists = false;
int shaderIdx = 0;
for (; shaderIdx < m_billboardTextShaders.size(); shaderIdx++)
{
std::optional<std::string> name = GetFragmentShaderName(m_billboardTextShaders[shaderIdx]);
if (name.value() == inputFragmentName.value())
{
exists = true;
break;
}
}
if (!exists)
{
Shader& shader = m_billboardTextShaders.emplace_back();
shaderIdx = m_billboardTextShaders.size() - 1;
shader.AddShaderProgram(OpenVulkano::ShaderProgramType::VERTEX, "Shader/billboard");
shader.AddShaderProgram(OpenVulkano::ShaderProgramType::FRAGMENT, inputFragmentName.value());
shader.AddVertexInputDescription(OpenVulkano::Vertex::GetVertexInputDescription());
shader.AddDescriptorSetLayoutBinding(Texture::DESCRIPTOR_SET_LAYOUT_BINDING);
DescriptorSetLayoutBinding binding = UniformBuffer::DESCRIPTOR_SET_LAYOUT_BINDING;
binding.stageFlags = ShaderProgramType::Type::VERTEX;
DescriptorSetLayoutBinding binding2 = UniformBuffer::DESCRIPTOR_SET_LAYOUT_BINDING;
binding2.stageFlags = ShaderProgramType::FRAGMENT;
shader.AddDescriptorSetLayoutBinding(binding2, 3);
shader.AddDescriptorSetLayoutBinding(binding, 4);
shader.depthWrite = false;
shader.depthCompareOp = CompareOp::LESS_OR_EQUAL;
shader.alphaBlend = true;
shader.cullMode = CullMode::NONE;
}
return &m_billboardTextShaders[shaderIdx];
}
void LabelDrawable::SetupShaders()
{
DescriptorSetLayoutBinding binding = UniformBuffer::DESCRIPTOR_SET_LAYOUT_BINDING;
@@ -237,6 +169,31 @@ namespace OpenVulkano::Scene
m_backgroundShader.AddDescriptorSetLayoutBinding(binding, 5);
m_backgroundShader.cullMode = CullMode::NONE;
SetShader(&m_backgroundShader);
FontAtlasType fontAtlasType(static_cast<FontAtlasType::Type>(m_atlasData->meta.atlasType));
if (!m_isBillboard)
{
m_textShader.AddShaderProgram(OpenVulkano::ShaderProgramType::VERTEX, "Shader/text");
}
else
{
m_textShader.AddShaderProgram(OpenVulkano::ShaderProgramType::VERTEX, "Shader/billboard");
DescriptorSetLayoutBinding billboardUniformBinding = UniformBuffer::DESCRIPTOR_SET_LAYOUT_BINDING;
billboardUniformBinding.stageFlags = ShaderProgramType::Type::VERTEX;
m_textShader.AddDescriptorSetLayoutBinding(billboardUniformBinding, 4);
}
DescriptorSetLayoutBinding textUniformBinding = UniformBuffer::DESCRIPTOR_SET_LAYOUT_BINDING;
textUniformBinding.stageFlags = ShaderProgramType::FRAGMENT;
m_textShader.AddDescriptorSetLayoutBinding(textUniformBinding, 3);
m_textShader.AddShaderProgram(OpenVulkano::ShaderProgramType::FRAGMENT,
std::string(fontAtlasType.GetDefaultFragmentShader()));
m_textShader.AddVertexInputDescription(OpenVulkano::Vertex::GetVertexInputDescription());
m_textShader.AddDescriptorSetLayoutBinding(Texture::DESCRIPTOR_SET_LAYOUT_BINDING, 2);
m_textShader.alphaBlend = true;
m_textShader.cullMode = CullMode::NONE;
m_textShader.depthWrite = false;
m_textShader.depthCompareOp = CompareOp::LESS_OR_EQUAL;
}
void LabelDrawable::SetupBuffers()

8
openVulkanoCpp/Scene/Prefabs/LabelDrawable.hpp
View File

@@ -46,8 +46,9 @@ namespace OpenVulkano::Scene
class LabelDrawable final : public Drawable
{
public:
LabelDrawable(const LabelDrawableSettings& settings = LabelDrawableSettings(), bool isBillboard = false);
void AddText(TextDrawable* td, const std::string& text);
LabelDrawable(const std::shared_ptr<AtlasData>& atlasData,
const LabelDrawableSettings& settings = LabelDrawableSettings(), bool isBillboard = false);
void AddText(const std::string& text, const TextConfig& config = TextConfig());
void SetLabelSettings(const LabelDrawableSettings& settings);
void SetBillboardSettings(const BillboardControlBlock& settings);
void SetPosition(const Math::Vector3f& pos) { m_position = pos; }
@@ -62,7 +63,6 @@ namespace OpenVulkano::Scene
const Math::AABB& GetBoundingBox() const { return m_bbox; }
private:
void RecalculateBbox(const Math::AABB& other);
Shader* GetBillboardTextShader(Shader* src);
void SetupShaders();
void SetupBuffers();
private:
@@ -73,8 +73,10 @@ namespace OpenVulkano::Scene
std::vector<Shader> m_billboardTextShaders;
// list over vector to prevent memory reallocation and crash
std::list<TextDrawable> m_texts;
Shader m_textShader;
LabelDrawableSettings m_settings;
LabelUniformData m_labelData;
std::shared_ptr<AtlasData> m_atlasData;
BillboardControlBlock m_billboardSettings;
Math::Vector3f m_position = { 0, 0, 0 };
Math::AABB m_bbox;