From 6cf23b53000e4540b3d696e90ee1d941a5349554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20=C5=A0toura=C4=8D?= <525032@mail.muni.cz>
Date: Tue, 9 May 2023 15:39:56 +0200
Subject: [PATCH] Obj owns VAO ptr, VAO owns buffer ptrs & vectors
---
src/gfx/include/gfx/control.hpp | 7 ------
src/gfx/include/gfx/object.hpp | 41 ++++++++++++---------------------
src/gfx/include/gfx/vao.hpp | 28 ++++++++++++++++++++++
src/gfx/src/object.cpp | 30 ++++++++----------------
src/gfx/src/render.cpp | 4 ++--
src/gfx/src/vao.cpp | 31 +++++++++++++++++++++++++
6 files changed, 86 insertions(+), 55 deletions(-)
diff --git a/src/gfx/include/gfx/control.hpp b/src/gfx/include/gfx/control.hpp
index 7581a88..13d5dc9 100644
--- a/src/gfx/include/gfx/control.hpp
+++ b/src/gfx/include/gfx/control.hpp
@@ -11,25 +11,18 @@
#include <string>
#include <memory>
-//#include <studio/simulator.hpp>
-
class Controller
{
protected:
float speed = 2.5f;
float step = 0;
- // FTO DO: shared ptr
- // Frame* bound_frame;
std::shared_ptr<Frame> bound_frame;
public:
- // Controller(Frame* frame)
- // : bound_frame{frame} {}
Controller() = default;
void setFrame(std::shared_ptr<Frame> frame) { bound_frame = frame; }
- // void setFrame(Frame* frame) { bound_frame = frame; }
virtual glm::vec3 getFrontVec() const { return -bound_frame->getRotationAxisZ(); }
virtual glm::vec3 getUpVec() const { return glm::vec3(0.0f, 1.0f, 0.0f); }
diff --git a/src/gfx/include/gfx/object.hpp b/src/gfx/include/gfx/object.hpp
index 16d8981..4fbda26 100644
--- a/src/gfx/include/gfx/object.hpp
+++ b/src/gfx/include/gfx/object.hpp
@@ -10,47 +10,36 @@
#include <gfx/vbo.hpp>
#include <gfx/ebo.hpp>
-// #include <gfx/shader.hpp>
-// using shader_ptr = std::shared_ptr<Shader>;
+using VAO_ptr = std::shared_ptr<VAO>;
class Object
{
- // FTO DO: vectory do bufferu
- std::vector<float> vertices;
- std::vector<unsigned int> indices;
- std::vector<float> normals;
-
- // FTO DO: shared ptr, VBO do VAO
- VAO _VAO;
- VBO _VBO_vertex;
- VBO _VBO_normal;
- EBO _EBO;
-
- glm::vec3 color;;
- std::string shader_type;
- // shader_ptr used_shader = nullptr;
+ VAO_ptr _VAO = std::make_shared<VAO>();
- bool buffer_object();
+ glm::vec3 color;
+ std::string shader_type;
public:
Object(std::vector<float> const &_vertices,
std::vector<unsigned int> const &_indices,
- std::vector<float> const &_normals,
+ std::vector<float> const &_normals = {},
glm::vec3 _color = glm::vec3(1.0f, 0.5f, 0.31f),
std::string _shader_type = "lit");
- // void setShader;
+ std::vector<float> const &getVertices() const { return _VAO->getVertices(); }
+ void setVertices(std::vector<float> const &new_vertices) { _VAO->setVertices(new_vertices); }
- std::vector<float> const &getVertices() const { return vertices; }
- void setVertices(std::vector<float> const &new_vertices) { vertices = new_vertices; }
+ std::vector<unsigned int> const &getIndices() const { return _VAO->getIndices(); }
+ void setIndices(std::vector<unsigned int> const &new_indices) { _VAO->setIndices(new_indices); }
- std::vector<unsigned int> const &getIndices() const { return indices; }
- void setIndices(std::vector<unsigned int> const &new_indices) { indices = new_indices; }
+ std::vector<float> const &getNormals() const { return _VAO->getNormals(); }
+ void setNormals(std::vector<float> const &new_normals) { _VAO->setNormals(new_normals); }
- std::vector<float> const &getNormals() const { return normals; }
- void setNormals(std::vector<float> const &new_normals) { normals = new_normals; }
+ void SendDataToVAO(std::vector<float> const &_vertices,
+ std::vector<unsigned int> const &_indices,
+ std::vector<float> const &_normals);
- VAO &getVAO() { return _VAO; }
+ VAO* getVAO() { return _VAO.get(); }
std::string getShaderType() const { return shader_type; }
void setShaderType(std::string new_type) { shader_type = new_type; }
diff --git a/src/gfx/include/gfx/vao.hpp b/src/gfx/include/gfx/vao.hpp
index 3d40cdf..84c8aab 100644
--- a/src/gfx/include/gfx/vao.hpp
+++ b/src/gfx/include/gfx/vao.hpp
@@ -3,12 +3,25 @@
#include <glad/glad.h>
#include <gfx/vbo.hpp>
+#include <gfx/ebo.hpp>
#include <utils/assumptions.hpp>
+#include <memory>
+
+using VBO_ptr = std::shared_ptr<VBO>;
+using EBO_ptr = std::shared_ptr<EBO>;
class VAO
{
unsigned int ID;
+ std::vector<float> vertices;
+ std::vector<unsigned int> indices;
+ std::vector<float> normals;
+
+ VBO_ptr _VBO_vertex = nullptr;
+ VBO_ptr _VBO_normal = nullptr;
+ EBO_ptr _EBO = nullptr;
+
public:
VAO();
~VAO();
@@ -17,6 +30,21 @@ public:
void Delete();
void LinkVBO(unsigned int layout_loc);
+
+ void BindVertices();
+ void BindNormals();
+ void BindIndices();
+
+ void BindBuffers();
+
+ std::vector<float> const &getVertices() const { return vertices; }
+ void setVertices(std::vector<float> const &new_vertices) { vertices = new_vertices; }
+
+ std::vector<unsigned int> const &getIndices() const { return indices; }
+ void setIndices(std::vector<unsigned int> const &new_indices) { indices = new_indices; }
+
+ std::vector<float> const &getNormals() const { return normals; }
+ void setNormals(std::vector<float> const &new_normals) { normals = new_normals; }
};
#endif
\ No newline at end of file
diff --git a/src/gfx/src/object.cpp b/src/gfx/src/object.cpp
index b6b930a..29d9b11 100644
--- a/src/gfx/src/object.cpp
+++ b/src/gfx/src/object.cpp
@@ -6,28 +6,18 @@ Object::Object(std::vector<float> const &_vertices,
std::vector<float> const &_normals,
glm::vec3 _color,
std::string _shader_type)
- : vertices{_vertices}, indices{_indices}, normals{_normals}, color{_color}, shader_type{_shader_type}
+ : color{_color}, shader_type{_shader_type}
{
- buffer_object();
+ _VAO->Bind();
+ SendDataToVAO(_vertices, _indices, _normals);
+ _VAO->BindBuffers();
}
-bool Object::buffer_object()
+void Object::SendDataToVAO(std::vector<float> const &_vertices,
+ std::vector<unsigned int> const &_indices,
+ std::vector<float> const &_normals)
{
- _VAO.Bind();
- // Vertices
- _VBO_vertex.Bind();
- _VBO_vertex.SendData(getVertices());
- _VAO.LinkVBO(0);
- // Normals
- _VBO_normal.Bind();
- _VBO_normal.SendData(getNormals());
- _VAO.LinkVBO(1);
- // Indices
- _EBO.Bind();
- _EBO.SendData(getIndices());
-
- // _VAO.Unbind();
- // _VBO.Unbind();
- // _EBO.Unbind();
- return true;
+ _VAO->setVertices(_vertices);
+ _VAO->setIndices(_indices);
+ _VAO->setNormals(_normals);
}
diff --git a/src/gfx/src/render.cpp b/src/gfx/src/render.cpp
index ff95e18..efd6816 100644
--- a/src/gfx/src/render.cpp
+++ b/src/gfx/src/render.cpp
@@ -93,7 +93,7 @@ void draw_objects(std::map<std::string, shader_ptr> &myShaders, light_ptr light,
send_matrices_to_shader(*myShaders[shader_used], model, view, projection);
- objects[i]->getVAO().Bind();
+ objects[i]->getVAO()->Bind();
glDrawElements(GL_TRIANGLES,
static_cast<GLsizei>(objects[i]->getIndices().size()),
@@ -112,7 +112,7 @@ void draw_grid(std::map<std::string, shader_ptr> &myShaders, Object &grid, Frame
send_matrices_to_shader(*myShaders["basic"], grid_model, view, projection);
- grid.getVAO().Bind();
+ grid.getVAO()->Bind();
glDrawElements(GL_LINES,
static_cast<GLsizei>(grid.getIndices().size()),
GL_UNSIGNED_INT,
diff --git a/src/gfx/src/vao.cpp b/src/gfx/src/vao.cpp
index edea44a..90790ff 100644
--- a/src/gfx/src/vao.cpp
+++ b/src/gfx/src/vao.cpp
@@ -43,3 +43,34 @@ void VAO::Delete()
ID = 0;
}
}
+
+void VAO::BindVertices()
+{
+ _VBO_vertex = std::make_shared<VBO>();
+ _VBO_vertex->Bind();
+ _VBO_vertex->SendData(vertices);
+ LinkVBO(0);
+}
+
+void VAO::BindNormals()
+{
+ _VBO_normal = std::make_shared<VBO>();
+ _VBO_normal->Bind();
+ _VBO_normal->SendData(normals);
+ LinkVBO(1);
+}
+
+void VAO::BindIndices()
+{
+ _EBO = std::make_shared<EBO>();
+ _EBO->Bind();
+ _EBO->SendData(indices);
+}
+
+void VAO::BindBuffers()
+{
+ BindVertices();
+ BindIndices();
+ if (!normals.empty())
+ BindNormals();
+}
\ No newline at end of file
--
GitLab