From c288f3ccba0a8ae31b0cecf197d0faa0638cc92e Mon Sep 17 00:00:00 2001 From: Georg Hagen Date: Sat, 4 Jan 2025 01:05:31 +0100 Subject: [PATCH] Remove redundant namespaces --- .../Scene/Prefabs/LabelDrawable.cpp | 12 ++++----- .../Scene/Prefabs/LabelDrawable.hpp | 1 - openVulkanoCpp/Scene/TextDrawable.cpp | 25 +++++++++---------- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/openVulkanoCpp/Scene/Prefabs/LabelDrawable.cpp b/openVulkanoCpp/Scene/Prefabs/LabelDrawable.cpp index 76e1c72..48b03ab 100644 --- a/openVulkanoCpp/Scene/Prefabs/LabelDrawable.cpp +++ b/openVulkanoCpp/Scene/Prefabs/LabelDrawable.cpp @@ -17,7 +17,7 @@ namespace OpenVulkano::Scene namespace { - Shader MakeLabelBgShader(bool billboard) + Shader MakeLabelBgShader(const bool billboard) { Shader backgroundShader; if (!billboard) @@ -44,7 +44,7 @@ namespace OpenVulkano::Scene Shader LabelDrawable::BACKGROUND_SHADER = MakeLabelBgShader(false); Shader LabelDrawable::BACKGROUND_BILLBOARD_SHADER = MakeLabelBgShader(true); - LabelDrawable::LabelDrawable(const std::shared_ptr& atlasData, const LabelDrawableSettings& settings, bool isBillboard) + LabelDrawable::LabelDrawable(const std::shared_ptr& atlasData, const LabelDrawableSettings& settings, const bool isBillboard) : Drawable(DrawEncoder::GetDrawEncoder(), DrawPhase::MAIN), m_atlasData(atlasData), m_isBillboard(isBillboard) { if (atlasData->glyphs.empty() || !atlasData->texture.size) @@ -115,11 +115,11 @@ namespace OpenVulkano::Scene FontAtlasType fontAtlasType(static_cast(m_atlasData->meta.atlasType)); if (!m_isBillboard) { - m_textShader.AddShaderProgram(OpenVulkano::ShaderProgramType::VERTEX, "Shader/text"); + m_textShader.AddShaderProgram(ShaderProgramType::VERTEX, "Shader/text"); } else { - m_textShader.AddShaderProgram(OpenVulkano::ShaderProgramType::VERTEX, "Shader/billboard"); + m_textShader.AddShaderProgram(ShaderProgramType::VERTEX, "Shader/billboard"); DescriptorSetLayoutBinding billboardUniformBinding = UniformBuffer::DESCRIPTOR_SET_LAYOUT_BINDING; billboardUniformBinding.stageFlags = ShaderProgramType::Type::VERTEX; m_textShader.AddDescriptorSetLayoutBinding(billboardUniformBinding, 4); @@ -128,9 +128,9 @@ namespace OpenVulkano::Scene DescriptorSetLayoutBinding textUniformBinding = UniformBuffer::DESCRIPTOR_SET_LAYOUT_BINDING; textUniformBinding.stageFlags = ShaderProgramType::FRAGMENT; m_textShader.AddDescriptorSetLayoutBinding(textUniformBinding, 3); - m_textShader.AddShaderProgram(OpenVulkano::ShaderProgramType::FRAGMENT, + m_textShader.AddShaderProgram(ShaderProgramType::FRAGMENT, std::string(fontAtlasType.GetDefaultFragmentShader())); - m_textShader.AddVertexInputDescription(OpenVulkano::Vertex::GetVertexInputDescription()); + m_textShader.AddVertexInputDescription(Vertex::GetVertexInputDescription()); m_textShader.AddDescriptorSetLayoutBinding(Texture::DESCRIPTOR_SET_LAYOUT_BINDING, 2); m_textShader.alphaBlend = true; m_textShader.cullMode = CullMode::NONE; diff --git a/openVulkanoCpp/Scene/Prefabs/LabelDrawable.hpp b/openVulkanoCpp/Scene/Prefabs/LabelDrawable.hpp index 990e434..cb406d9 100644 --- a/openVulkanoCpp/Scene/Prefabs/LabelDrawable.hpp +++ b/openVulkanoCpp/Scene/Prefabs/LabelDrawable.hpp @@ -19,7 +19,6 @@ namespace OpenVulkano::Scene { - struct LabelDrawableSettings { Math::Vector4f backgroundColor = { 1, 0, 0, 1 }; diff --git a/openVulkanoCpp/Scene/TextDrawable.cpp b/openVulkanoCpp/Scene/TextDrawable.cpp index f23262d..476e064 100644 --- a/openVulkanoCpp/Scene/TextDrawable.cpp +++ b/openVulkanoCpp/Scene/TextDrawable.cpp @@ -26,9 +26,9 @@ namespace OpenVulkano::Scene static Shader sdfDefaultShader; if (once) { - sdfDefaultShader.AddShaderProgram(OpenVulkano::ShaderProgramType::VERTEX, "Shader/sdfText"); - sdfDefaultShader.AddShaderProgram(OpenVulkano::ShaderProgramType::FRAGMENT, "Shader/sdfText"); - sdfDefaultShader.AddVertexInputDescription(OpenVulkano::Vertex::GetVertexInputDescription()); + sdfDefaultShader.AddShaderProgram(ShaderProgramType::VERTEX, "Shader/sdfText"); + sdfDefaultShader.AddShaderProgram(ShaderProgramType::FRAGMENT, "Shader/sdfText"); + sdfDefaultShader.AddVertexInputDescription(Vertex::GetVertexInputDescription()); sdfDefaultShader.AddDescriptorSetLayoutBinding(Texture::DESCRIPTOR_SET_LAYOUT_BINDING); DescriptorSetLayoutBinding desc = UniformBuffer::DESCRIPTOR_SET_LAYOUT_BINDING; desc.stageFlags = ShaderProgramType::FRAGMENT; @@ -46,9 +46,9 @@ namespace OpenVulkano::Scene static Shader msdfDefaultShader; if (once) { - msdfDefaultShader.AddShaderProgram(OpenVulkano::ShaderProgramType::VERTEX, "Shader/sdfText"); - msdfDefaultShader.AddShaderProgram(OpenVulkano::ShaderProgramType::FRAGMENT, "Shader/msdfText"); - msdfDefaultShader.AddVertexInputDescription(OpenVulkano::Vertex::GetVertexInputDescription()); + msdfDefaultShader.AddShaderProgram(ShaderProgramType::VERTEX, "Shader/sdfText"); + msdfDefaultShader.AddShaderProgram(ShaderProgramType::FRAGMENT, "Shader/msdfText"); + msdfDefaultShader.AddVertexInputDescription(Vertex::GetVertexInputDescription()); msdfDefaultShader.AddDescriptorSetLayoutBinding(Texture::DESCRIPTOR_SET_LAYOUT_BINDING); DescriptorSetLayoutBinding desc = UniformBuffer::DESCRIPTOR_SET_LAYOUT_BINDING; desc.stageFlags = ShaderProgramType::FRAGMENT; @@ -66,9 +66,9 @@ namespace OpenVulkano::Scene static Shader bitmapDefaultShader; if (once) { - bitmapDefaultShader.AddShaderProgram(OpenVulkano::ShaderProgramType::VERTEX, "Shader/text"); - bitmapDefaultShader.AddShaderProgram(OpenVulkano::ShaderProgramType::FRAGMENT, "Shader/text"); - bitmapDefaultShader.AddVertexInputDescription(OpenVulkano::Vertex::GetVertexInputDescription()); + bitmapDefaultShader.AddShaderProgram(ShaderProgramType::VERTEX, "Shader/text"); + bitmapDefaultShader.AddShaderProgram(ShaderProgramType::FRAGMENT, "Shader/text"); + bitmapDefaultShader.AddVertexInputDescription(Vertex::GetVertexInputDescription()); bitmapDefaultShader.AddDescriptorSetLayoutBinding(Texture::DESCRIPTOR_SET_LAYOUT_BINDING); DescriptorSetLayoutBinding desc = UniformBuffer::DESCRIPTOR_SET_LAYOUT_BINDING; desc.stageFlags = ShaderProgramType::FRAGMENT; @@ -93,12 +93,12 @@ namespace OpenVulkano::Scene } TextDrawable::TextDrawable(const std::string& atlasMetadataFile, const TextConfig& config) - : TextDrawable(OpenVulkano::Utils::ReadFile(atlasMetadataFile), nullptr, config) + : TextDrawable(Utils::ReadFile(atlasMetadataFile), nullptr, config) { } TextDrawable::TextDrawable(const std::string& atlasMetadataFile, Texture* atlasTex, const TextConfig& config) - : TextDrawable(OpenVulkano::Utils::ReadFile(atlasMetadataFile), atlasTex, config) + : TextDrawable(Utils::ReadFile(atlasMetadataFile), atlasTex, config) { } @@ -114,8 +114,7 @@ namespace OpenVulkano::Scene if (isPacked) { m_material.texture = &m_atlasData->texture; - m_atlasData->img = Image::IImageLoader::loadData((const uint8_t*) atlasMetadata.Data(), - offsetToMetadata); + m_atlasData->img = Image::IImageLoader::loadData(reinterpret_cast(atlasMetadata.Data()), offsetToMetadata); m_material.texture->format = m_atlasData->img->dataFormat; m_material.texture->resolution = m_atlasData->img->resolution; m_material.texture->size = m_atlasData->img->data.Size();