Delete duplicated variable
This commit is contained in:
@@ -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>& atlasData)
|
||||
|
||||
@@ -47,11 +47,9 @@ namespace OpenVulkano::Scene
|
||||
TextDrawable(const std::shared_ptr<AtlasData>& 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>& 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<AtlasData> GetAtlasData() { return m_atlasData; }
|
||||
private:
|
||||
@@ -60,7 +58,6 @@ namespace OpenVulkano::Scene
|
||||
UniformBuffer m_uniBuffer;
|
||||
std::shared_ptr<AtlasData> m_atlasData;
|
||||
Math::AABB m_bbox;
|
||||
Shader* m_shader = nullptr;
|
||||
std::string m_text;
|
||||
TextConfig m_cfg;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user