Merge branch 'master' into develop

Author: MrScriptX

Engine/world/GameObject.cpp

@@ -76,6 +76,23 @@ std::vector<uint32_t> GameObject::GetIndices(const size_t& index)
 	return m_meshes[index].get_indices();
 }
 
+void GameObject::UpdateMesh(const size_t& index, const std::vector<Vertex>& vertices, const std::vector<uint32_t>& indices)
+{
+	m_meshes[index].SetVertices(vertices);
+	m_meshes[index].SetIndices(indices);
+	m_meshes[index].createBuffer(mp_renderer);
+}
+
+std::vector<Vertex> GameObject::GetVertices(const size_t& index)
+{
+	return m_meshes[index].get_vertices();
+}
+
+std::vector<uint32_t> GameObject::GetIndices(const size_t& index)
+{
+	return m_meshes[index].get_indices();
+}
+
 Mesh& GameObject::getMesh(const size_t& index)
 {
 	return m_meshes[index];

Engine/world/Mesh.cpp

@@ -134,6 +134,16 @@ void Mesh::SetIndices(const std::vector<uint32_t>& indices)
 	m_indices = indices;
 }
 
+void Mesh::SetVertices(const std::vector<Vertex>& vertices)
+{
+	m_vertices = vertices;
+}
+
+void Mesh::SetIndices(const std::vector<uint32_t>& indices)
+{
+	m_indices = indices;
+}
+
 std::vector<Vertex>& Mesh::get_vertices()
 {
 	return m_vertices;

Engine/world/Mesh.h

@@ -32,6 +32,9 @@ class Mesh
 	void SetVertices(const std::vector<Vertex>& vertices);
 	void SetIndices(const std::vector<uint32_t>& indices);
 
+	void SetVertices(const std::vector<Vertex>& vertices);
+	void SetIndices(const std::vector<uint32_t>& indices);
+
 	std::vector<Vertex>& get_vertices();
 	std::vector<uint32_t>& get_indices();
 	Buffer& getBuffer();