From d63dfe2f9f5d34e320d4cf58c109be79c84890a9 Mon Sep 17 00:00:00 2001 From: Riyyi Date: Sat, 10 Aug 2024 22:05:21 +0200 Subject: [PATCH] Render: Update getter to match naming convention --- src/inferno/render/buffer.cpp | 2 +- src/inferno/render/buffer.h | 6 +++--- src/inferno/render/render-command.cpp | 2 +- src/inferno/render/renderer.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/inferno/render/buffer.cpp b/src/inferno/render/buffer.cpp index ec1b816..01796b2 100644 --- a/src/inferno/render/buffer.cpp +++ b/src/inferno/render/buffer.cpp @@ -303,7 +303,7 @@ void VertexArray::unbind() const void VertexArray::addVertexBuffer(std::shared_ptr vertexBuffer) { - const auto& layout = vertexBuffer->getLayout(); + const auto& layout = vertexBuffer->layout(); VERIFY(layout.elements().size(), "VertexBuffer has no layout"); bind(); diff --git a/src/inferno/render/buffer.h b/src/inferno/render/buffer.h index 720de26..fd9a46c 100644 --- a/src/inferno/render/buffer.h +++ b/src/inferno/render/buffer.h @@ -104,7 +104,7 @@ public: void uploadData(const void* data, uint32_t size); - const BufferLayout& getLayout() const { return m_layout; } + const BufferLayout& layout() const { return m_layout; } void setLayout(const BufferLayout& layout) { m_layout = layout; } @@ -126,7 +126,7 @@ public: void uploadData(const void* data, uint32_t size); - uint32_t getCount() const { return m_count; } + uint32_t count() const { return m_count; } private: uint32_t m_id { 0 }; @@ -148,7 +148,7 @@ public: void setIndexBuffer(std::shared_ptr indexBuffer); std::shared_ptr at(size_t i) const { return m_vertexBuffers.at(i); } - std::shared_ptr getIndexBuffer() const { return m_indexBuffer; } + std::shared_ptr indexBuffer() const { return m_indexBuffer; } private: uint32_t m_id { 0 }; diff --git a/src/inferno/render/render-command.cpp b/src/inferno/render/render-command.cpp index 6e77838..e73d81a 100644 --- a/src/inferno/render/render-command.cpp +++ b/src/inferno/render/render-command.cpp @@ -42,7 +42,7 @@ void RenderCommand::clearColor(const glm::vec4& color) void RenderCommand::drawIndexed(std::shared_ptr vertexArray, uint32_t indexCount) { - uint32_t count = indexCount ? indexCount : vertexArray->getIndexBuffer()->getCount(); + uint32_t count = indexCount ? indexCount : vertexArray->indexBuffer()->count(); glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_INT, nullptr); } diff --git a/src/inferno/render/renderer.cpp b/src/inferno/render/renderer.cpp index 0f78727..1625347 100644 --- a/src/inferno/render/renderer.cpp +++ b/src/inferno/render/renderer.cpp @@ -548,7 +548,7 @@ void Renderer3D::createElementBuffer() void Renderer3D::uploadElementBuffer() { - m_vertexArray->getIndexBuffer()->uploadData(m_elementBufferBase, m_elementIndex * sizeof(uint32_t)); + m_vertexArray->indexBuffer()->uploadData(m_elementBufferBase, m_elementIndex * sizeof(uint32_t)); } void Renderer3D::loadShader()