From 54441024b3b7448699cf6b94dd0c50172eec78eb Mon Sep 17 00:00:00 2001 From: Georg Hagen Date: Sat, 4 Jan 2025 01:02:37 +0100 Subject: [PATCH] Delete duplicated variable --- openVulkanoCpp/Scene/TextDrawable.cpp | 2 +- openVulkanoCpp/Scene/TextDrawable.hpp | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/openVulkanoCpp/Scene/TextDrawable.cpp b/openVulkanoCpp/Scene/TextDrawable.cpp index adffe2b..f23262d 100644 --- a/openVulkanoCpp/Scene/TextDrawable.cpp +++ b/openVulkanoCpp/Scene/TextDrawable.cpp @@ -272,7 +272,7 @@ namespace OpenVulkano::Scene ++i; } m_bbox.Init(bmin, bmax); - SimpleDrawable::Init(m_shader, &m_geometry, &m_material, &m_uniBuffer); + SimpleDrawable::Init(nullptr, &m_geometry, &m_material, &m_uniBuffer); } void TextDrawable::SetAtlasData(const std::shared_ptr& atlasData) diff --git a/openVulkanoCpp/Scene/TextDrawable.hpp b/openVulkanoCpp/Scene/TextDrawable.hpp index f8d6e3f..8e07e74 100644 --- a/openVulkanoCpp/Scene/TextDrawable.hpp +++ b/openVulkanoCpp/Scene/TextDrawable.hpp @@ -47,11 +47,9 @@ namespace OpenVulkano::Scene TextDrawable(const std::shared_ptr& atlasData, const TextConfig& config = TextConfig()); void GenerateText(const std::string& text, const Math::Vector3f& pos = Math::Vector3f(0.f)); void SetConfig(const TextConfig& cfg) { m_cfg = cfg; } - void SetShader(Shader* shader) { m_shader = shader; } void SetAtlasData(const std::shared_ptr& atlasData); Math::AABB& GetBoundingBox() { return m_bbox; } TextConfig& GetConfig() { return m_cfg; } - Shader* GetShader() { return m_shader; } [[nodiscard]] const std::string& GetText() const { return m_text; } std::shared_ptr GetAtlasData() { return m_atlasData; } private: @@ -60,7 +58,6 @@ namespace OpenVulkano::Scene UniformBuffer m_uniBuffer; std::shared_ptr m_atlasData; Math::AABB m_bbox; - Shader* m_shader = nullptr; std::string m_text; TextConfig m_cfg; };