From 7761387403e68749865ee918fd53405354c344ff Mon Sep 17 00:00:00 2001
From: Linloir <3145078758@qq.com>
Date: Mon, 12 Dec 2022 22:51:59 +0800
Subject: [PATCH] Rename functions

---
 FinalProject/mesh.cpp | 4 ++--
 FinalProject/vao.h    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/FinalProject/mesh.cpp b/FinalProject/mesh.cpp
index 3c316c1..e31a0fa 100644
--- a/FinalProject/mesh.cpp
+++ b/FinalProject/mesh.cpp
@@ -37,9 +37,9 @@ void Mesh::render(const ShaderProgram& shader) const {
     }
     OPENGL_EXTRA_FUNCTIONS->glActiveTexture(GL_TEXTURE0);
 
-    _vao.setActive();
+    _vao.bind();
     OPENGL_EXTRA_FUNCTIONS->glDrawElements(GL_TRIANGLES, _indices.size(), GL_UNSIGNED_INT, 0);
-    _vao.setInactive();
+    _vao.unbind();
 }
 
 void Mesh::setupMesh() {
diff --git a/FinalProject/vao.h b/FinalProject/vao.h
index 5cbd93a..dd0d8f8 100644
--- a/FinalProject/vao.h
+++ b/FinalProject/vao.h
@@ -22,8 +22,8 @@ public:
 
     inline unsigned int id() const { return _id; }
 
-    inline void setActive() const;
-    inline void setInactive() const;
+    inline void bind() const;
+    inline void unbind() const;
 
     inline void bindVertexBufferObject(const VertexBufferObject& vbo);
     inline void bindVertexBufferObject(VertexBufferObject&& vbo);
@@ -35,7 +35,7 @@ public:
     inline void disableVertexAttribute(unsigned int index) const;
 };
 
-inline void VertexArrayObject::setActive() const {
+inline void VertexArrayObject::bind() const {
     // Check is id is valid
     if (_id == -1) {
         Logger::error("Binding an invalid VertexArrayObject");
@@ -44,7 +44,7 @@ inline void VertexArrayObject::setActive() const {
     OPENGL_EXTRA_FUNCTIONS->glBindVertexArray(_id);
 }
 
-inline void VertexArrayObject::setInactive() const {
+inline void VertexArrayObject::unbind() const {
     OPENGL_EXTRA_FUNCTIONS->glBindVertexArray(0);
 }