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

Optimize label size calculation

Browse Source
This commit is contained in:
Georg Hagen
2025-01-05 16:31:04 +01:00
parent e9a1c629d9
commit aca64c57b7
6 changed files with 102 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
openVulkanoCpp/Math/Math.hpp
View File

@@ -177,3 +177,15 @@ glm::vec<L, float, Q> operator / (const float lhs, const glm::vec<L, T, Q>& rhs)
{ {
return lhs / glm::vec<L, float, Q>(rhs); return lhs / glm::vec<L, float, Q>(rhs);
} }
template<glm::length_t L, typename T, glm::qualifier Q, typename = std::enable_if_t<std::is_integral_v<T>>>
glm::vec<L, float, Q> operator * (const float lhs, const glm::vec<L, T, Q>& rhs)
{
return lhs * glm::vec<L, float, Q>(rhs);
}
template<glm::length_t L, typename T, glm::qualifier Q, typename = std::enable_if_t<std::is_integral_v<T>>>
glm::vec<L, float, Q> operator * (const glm::vec<L, float, Q>& lhs, const T rhs)
{
return lhs * static_cast<float>(rhs);
}

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

@@ -15,8 +15,6 @@
namespace OpenVulkano::Scene namespace OpenVulkano::Scene
{ {
using namespace Math;
namespace namespace
{ {
Shader MakeLabelBgShader(const bool billboard) Shader MakeLabelBgShader(const bool billboard)
@@ -45,7 +43,6 @@ namespace OpenVulkano::Scene
Shader MakeLabelTextShader(const FontAtlasType type, const bool billboard) Shader MakeLabelTextShader(const FontAtlasType type, const bool billboard)
{ {
Shader shader = TextDrawable::MakeDefaultShader(type); Shader shader = TextDrawable::MakeDefaultShader(type);
shader.depthTest = false;
shader.depthCompareOp = CompareOp::LESS_OR_EQUAL; shader.depthCompareOp = CompareOp::LESS_OR_EQUAL;
if (billboard) if (billboard)
{ {
@@ -117,20 +114,12 @@ namespace OpenVulkano::Scene
// update position for next text entry // update position for next text entry
m_position.y = m_bbox.GetMin().y - lineHeight; m_position.y = m_bbox.GetMin().y - lineHeight;
const auto& min = m_bbox.GetMin(); Math::Vector2f padding = m_settings.padding * 2;
const auto& max = m_bbox.GetMax(); if (m_settings.hasArrow) padding.y += m_settings.arrowLength;
Vertex v, v2, v3, v4;
const float offset = 0.001;
const float yOffset = m_settings.hasArrow ? m_settings.arrowLength : 0;
v.position = Vector3f(min.x - m_settings.horizontalOffset, min.y - m_settings.verticalOffset - yOffset, min.z - offset);
v2.position = Vector3f(max.x + m_settings.horizontalOffset, min.y - m_settings.verticalOffset - yOffset, min.z - offset);
v3.position = Vector3f(max.x + m_settings.horizontalOffset, max.y + m_settings.verticalOffset, min.z - offset);
v4.position = Vector3f(min.x - m_settings.horizontalOffset, max.y + m_settings.verticalOffset, min.z - offset);
m_labelData.textSize.x = v2.position.x - v.position.x; m_labelData.textSize = Math::Vector2f(m_bbox.GetSize()) + padding * 2;
m_labelData.textSize.y = v3.position.y - v.position.y; m_labelData.bboxCenter = { m_bbox.GetCenter() };
m_labelData.bboxCenter.x = (v2.position.x + v.position.x) / 2; if (m_settings.hasArrow) m_labelData.bboxCenter.y -= m_settings.arrowLength;
m_labelData.bboxCenter.y = (v3.position.y + v.position.y) / 2;
} }
void LabelDrawable::SetBillboardSettings(const BillboardControlBlock& settings) void LabelDrawable::SetBillboardSettings(const BillboardControlBlock& settings)

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

@@ -21,8 +21,7 @@ namespace OpenVulkano::Scene
struct LabelDrawableSettings struct LabelDrawableSettings
{ {
Math::Vector4f backgroundColor = { 1, 0, 0, 1 }; Math::Vector4f backgroundColor = { 1, 0, 0, 1 };
float horizontalOffset = 0.05f; Math::Vector2f padding = { 0.2f, 0.2f };
float verticalOffset = 0.05f;
float cornerRadius = 0.05f; float cornerRadius = 0.05f;
float arrowLength = 0.5f; float arrowLength = 0.5f;
float arrowWidth = 0.2f; float arrowWidth = 0.2f;
@@ -32,9 +31,9 @@ namespace OpenVulkano::Scene
struct LabelUniformData struct LabelUniformData
{ {
Math::Vector4f textSize = { 0, 0, 0, 0 };
Math::Vector4f color = { 0, 0, 0, 0 }; Math::Vector4f color = { 0, 0, 0, 0 };
Math::Vector4f bboxCenter = { 0, 0, 0, 0 }; Math::Vector2f textSize = {};
Math::Vector2f bboxCenter = {};
float cornerRadius = 0.f; float cornerRadius = 0.f;
float arrowLength = 0.f; float arrowLength = 0.f;
float arrowWidth = 0.f; float arrowWidth = 0.f;

120
openVulkanoCpp/Shader/label.frag
View File

@@ -5,69 +5,69 @@ layout(location = 0) out vec4 outColor;
layout(set = 5, binding = 0) uniform LabelData layout(set = 5, binding = 0) uniform LabelData
{ {
vec4 textSize; vec4 color;
vec4 color; vec2 textSize;
vec4 bboxCenter; vec2 bboxCenter;
float radius; float radius;
float arrowLength; float arrowLength;
float arrowWidth; float arrowWidth;
bool hasRoundedCorners; bool hasRoundedCorners;
bool hasArrow; bool hasArrow;
} labelInfo; } labelInfo;
void main() void main()
{ {
if (labelInfo.hasRoundedCorners || labelInfo.hasArrow) if (labelInfo.hasRoundedCorners || labelInfo.hasArrow)
{ {
vec2 bbox = vec2(labelInfo.textSize); vec2 bbox = vec2(labelInfo.textSize);
const float arrowLength = int(labelInfo.hasArrow) * labelInfo.arrowLength; const float arrowLength = int(labelInfo.hasArrow) * labelInfo.arrowLength;
float arrowWidth = labelInfo.arrowWidth; float arrowWidth = labelInfo.arrowWidth;
vec2 uvScaled = texCoord; vec2 uvScaled = texCoord;
float distX = min(uvScaled.x, bbox.x - uvScaled.x); float distX = min(uvScaled.x, bbox.x - uvScaled.x);
float distY = min(uvScaled.y - arrowLength, bbox.y - uvScaled.y); float distY = min(uvScaled.y - arrowLength, bbox.y - uvScaled.y);
float distanceFromCorner = distX * distY; float distanceFromCorner = distX * distY;
if (distanceFromCorner < labelInfo.radius) if (distanceFromCorner < labelInfo.radius)
{ {
// plain arrow // plain arrow
if (labelInfo.hasArrow && !labelInfo.hasRoundedCorners) if (labelInfo.hasArrow && !labelInfo.hasRoundedCorners)
{ {
// Some bias to prevent line between arrow and label + // Some bias to prevent line between arrow and label +
// check that we are dealing with lower parts of the label where arrow should be drawn, // check that we are dealing with lower parts of the label where arrow should be drawn,
// to prevent discarding fragments from upper corners // to prevent discarding fragments from upper corners
if (distY <= 0.01 && uvScaled.y < (bbox.y - arrowWidth) && arrowLength != 0.0f) if (distY <= 0.01 && uvScaled.y < (bbox.y - arrowWidth) && arrowLength != 0.0f)
{ {
arrowWidth = arrowWidth * ((arrowLength + distY) / arrowLength); arrowWidth = arrowWidth * ((arrowLength + distY) / arrowLength);
if (distX < (bbox.x - arrowWidth) * 0.5) if (distX < (bbox.x - arrowWidth) * 0.5)
{ {
discard; discard;
} }
} }
} }
// TODO: rounded corners + rounded arrow. // TODO: rounded corners + rounded arrow.
// now renders rounded corners and sharp arrow // now renders rounded corners and sharp arrow
else if (labelInfo.hasArrow && labelInfo.hasRoundedCorners) else if (labelInfo.hasArrow && labelInfo.hasRoundedCorners)
{ {
if (distY <= 0.05 && uvScaled.y < (bbox.y - arrowWidth) && arrowLength != 0.0f) if (distY <= 0.05 && uvScaled.y < (bbox.y - arrowWidth) && arrowLength != 0.0f)
{ {
arrowWidth = arrowWidth * ((arrowLength + distY) / arrowLength); arrowWidth = arrowWidth * ((arrowLength + distY) / arrowLength);
if (distX < (bbox.x - arrowWidth) * 0.5) if (distX < (bbox.x - arrowWidth) * 0.5)
{ {
discard; discard;
} }
} }
else else
{ {
discard; discard;
} }
} }
// no arrow, rounded corners // no arrow, rounded corners
else else
{ {
discard; discard;
} }
} }
} }
outColor = labelInfo.color; outColor = labelInfo.color;
} }

34
openVulkanoCpp/Shader/label.vert
View File

@@ -8,18 +8,18 @@ layout(set = 0, binding = 0) uniform NodeData
layout(set = 1, binding = 0) uniform CameraData layout(set = 1, binding = 0) uniform CameraData
{ {
mat4 viewProjection; mat4 viewProjection;
} cam; } cam;
layout(set = 5, binding = 0) uniform LabelData layout(set = 5, binding = 0) uniform LabelData
{ {
vec4 textSize; vec4 color;
vec4 color; vec2 textSize;
vec4 bboxCenter; vec2 bboxCenter;
float radius; float radius;
float arrowLength; float arrowLength;
bool hasRoundedCorners; bool hasRoundedCorners;
bool hasArrow; bool hasArrow;
} labelInfo; } labelInfo;
layout(location = 0) out vec4 color; layout(location = 0) out vec4 color;
@@ -28,18 +28,18 @@ layout(location = 1) out vec2 textureCoordinates;
// Background plane positions are in clipped space // Background plane positions are in clipped space
const vec4 PLANE[4] = vec4[]( const vec4 PLANE[4] = vec4[](
vec4(-0.5, -0.5, 0, 1), vec4(0.5, -0.5, 0, 1), vec4(-0.5, 0.5, 0, 1), vec4(0.5, 0.5, 0, 1) vec4(-0.5, -0.5, 0, 1), vec4(0.5, -0.5, 0, 1), vec4(-0.5, 0.5, 0, 1), vec4(0.5, 0.5, 0, 1)
); );
const vec2 TEX_COORDS[4] = vec2[]( const vec2 TEX_COORDS[4] = vec2[](
vec2(0, 0), vec2(1, 0), vec2(0, 1), vec2(1, 1) vec2(0, 0), vec2(1, 0), vec2(0, 1), vec2(1, 1)
); );
void main() { void main()
vec4 position = PLANE[gl_VertexIndex]; {
vec2 bbox = labelInfo.textSize.xy; vec4 position = PLANE[gl_VertexIndex];
position.xy *= bbox; position.xy *= labelInfo.textSize;
position.xy += vec2(labelInfo.bboxCenter); position.xy += labelInfo.bboxCenter;
position.z = -0.001; //position.z = -0.001;
gl_Position = cam.viewProjection * node.world * position; gl_Position = cam.viewProjection * node.world * position;
textureCoordinates = TEX_COORDS[gl_VertexIndex] * bbox; textureCoordinates = TEX_COORDS[gl_VertexIndex] * labelInfo.textSize;
} }

11
openVulkanoCpp/Shader/labelBillboard.vert
View File

@@ -30,9 +30,9 @@ layout(set = 4, binding = 0) uniform BillboardData
layout(set = 5, binding = 0) uniform LabelData layout(set = 5, binding = 0) uniform LabelData
{ {
vec4 textSize;
vec4 color; vec4 color;
vec4 bboxCenter; vec2 textSize;
vec2 bboxCenter;
float radius; float radius;
float arrowLength; float arrowLength;
bool hasRoundedCorners; bool hasRoundedCorners;
@@ -53,11 +53,10 @@ const vec2 TEX_COORDS[4] = vec2[](
void main() { void main() {
vec4 position = PLANE[gl_VertexIndex]; vec4 position = PLANE[gl_VertexIndex];
vec2 bbox = labelInfo.textSize.xy; position.xy *= labelInfo.textSize;
position.xy *= bbox; position.xy += labelInfo.bboxCenter;
position.xy += vec2(labelInfo.bboxCenter);
position.z = -0.001; position.z = -0.001;
textureCoordinates = TEX_COORDS[gl_VertexIndex] * bbox; textureCoordinates = TEX_COORDS[gl_VertexIndex] * labelInfo.textSize;
if (!billboardInfo.isFixedSize) if (!billboardInfo.isFixedSize)
{ {