Browse Source

cleanup

master
alistair 2 years ago
parent
commit
2c797d9ad2
  1. 2
      src/drawing.cpp
  2. 9
      src/main.cpp

2
src/drawing.cpp

@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
#include "drawing.h"
#include "glutil.h"
#include "components.h"
#include "level.h"
namespace drawing {
@ -16,6 +15,7 @@ void instanced_draw(const instanced_renderer r, const glm::mat4 view, const glm: @@ -16,6 +15,7 @@ void instanced_draw(const instanced_renderer r, const glm::mat4 view, const glm:
}
instanced_renderer instanced_setup(Shader* shader, const std::vector<position> &positions) {
GLuint instance_VBO;

9
src/main.cpp

@ -43,8 +43,6 @@ class SDLGLGLWindow { @@ -43,8 +43,6 @@ class SDLGLGLWindow {
unsigned int quadVBO = 0;
// unsigned int gIBO = 0;
unsigned int gVAO = 0;
unsigned int instance_VBO;
unsigned int lightVAO;
unsigned int quadVAO;
unsigned int texture[2];
unsigned int cubemap;
@ -315,8 +313,6 @@ class SDLGLGLWindow { @@ -315,8 +313,6 @@ class SDLGLGLWindow {
Cubemap c (faces);
cubemap = c.id;
glGenVertexArrays(1, &lightVAO);
glBindVertexArray(lightVAO);
@ -413,11 +409,6 @@ class SDLGLGLWindow { @@ -413,11 +409,6 @@ class SDLGLGLWindow {
glEnableVertexAttribArray(2);
glCheckError();
glBindBuffer(GL_ARRAY_BUFFER, instance_VBO);
glVertexAttribPointer(3,3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), NULL);
glVertexAttribDivisor(3,1);
//glBindBuffer(GL_ARRAY_BUFFER, 0);
glEnableVertexAttribArray(3);
/*********** ENDCUBES **************/

Loading…
Cancel
Save