diff --git a/src/DarkRP2D.cpp b/src/DarkRP2D.cpp index 695d3aa..8300ee4 100644 --- a/src/DarkRP2D.cpp +++ b/src/DarkRP2D.cpp @@ -18,7 +18,7 @@ void DarkRP2D::create () { assets->loadShader("vert.shader","frag.shader",nullptr,"defaultShader"); assets->loadShader("bitmapvert.shader","bitmapfrag.shader",nullptr,"bitmapShader"); - obj = new GameObject(); + obj = new Mesh(); inputHandler = new InputHandler(); font = new BitmapFont("arial.ttf"); diff --git a/src/DarkRP2D.h b/src/DarkRP2D.h index 97c574c..49b862c 100644 --- a/src/DarkRP2D.h +++ b/src/DarkRP2D.h @@ -5,7 +5,7 @@ class Reassembly2; #include #include #include "Assets.h" -#include "GameObject.h" +#include "Mesh.h" #include "InputHandler.h" #include "BitmapFont.h" @@ -13,7 +13,7 @@ class DarkRP2D { private: SDL_Window* gWindow; Assets *assets; - GameObject *obj; + Mesh *obj; InputHandler *inputHandler; BitmapFont *font; diff --git a/src/GameObject.h b/src/GameObject.h deleted file mode 100644 index 84a241e..0000000 --- a/src/GameObject.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef GAMEOBJECT_H -#define GAMEOBJECT_H - -class GameObject { - private: - unsigned int VBO; - unsigned int VAO; - - public: - GameObject(); - ~GameObject(); - - void draw(); - -}; - -#endif diff --git a/src/GameObject.cpp b/src/Mesh.cpp similarity index 81% rename from src/GameObject.cpp rename to src/Mesh.cpp index 068b133..3101278 100644 --- a/src/GameObject.cpp +++ b/src/Mesh.cpp @@ -1,9 +1,9 @@ -#include "GameObject.h" +#include "Mesh.h" #include #include -GameObject::GameObject() { +Mesh::Mesh() { //Create VBO glGenBuffers(1, &VBO); float vertices[] = { @@ -25,13 +25,13 @@ GameObject::GameObject() { glBindVertexArray(0); } -GameObject::~GameObject() { - std::cout << "Deleting GameObject" << std::endl; +Mesh::~Mesh() { + std::cout << "Deleting Mesh" << std::endl; glDeleteBuffers(1,&VBO); glDeleteBuffers(1,&VAO); } -void GameObject::draw() { +void Mesh::draw() { glBindVertexArray(this->VAO); glDrawArrays(GL_TRIANGLES, 0, 3); } diff --git a/src/Mesh.h b/src/Mesh.h new file mode 100644 index 0000000..b561c27 --- /dev/null +++ b/src/Mesh.h @@ -0,0 +1,16 @@ +#ifndef MESH_H +#define MESH_H + +class Mesh { + private: + unsigned int VBO, VAO; + + public: + Mesh(); + ~Mesh(); + + void draw(); + +}; + +#endif