added asset loading class, zoom factor, vbo switch, shader version

2017-03-13 01:16:20 +00:00
parent a2a221b17a
commit ee6d352fc6
25 changed files with 345 additions and 108 deletions
--- a/engine/shape.h
+++ b/engine/shape.h
@@ -16,7 +16,9 @@ public:
    ~Shape()
    {
        glDeleteBuffers(2, buffers);
+#if USE_VBO
        glDeleteVertexArrays(2, arrays);
+#endif // USE_VBO
    }
 protected:
    glm::vec2 quad_mid_point(glm::vec2 a, glm::vec2 b, glm::vec2 c, glm::vec2 d)