X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmodel.cpp;h=1d4edef0b17fea6ea45845c67a9b2333535f858e;hb=35c09fc00094a3d390732fd533b2bd03413d90c7;hp=125d57aefcd16d7f7e7291229bf999879610d5d4;hpb=e74f1ad236429f05db90c0ace825277e2a3fbc05;p=blank.git diff --git a/src/model.cpp b/src/model.cpp index 125d57a..1d4edef 100644 --- a/src/model.cpp +++ b/src/model.cpp @@ -93,7 +93,6 @@ void Model::Update(const Buffer &buf) { void Model::Draw() const { glBindVertexArray(va); - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, handle[ATTRIB_INDEX]); glDrawElements( GL_TRIANGLES, // how count, // count @@ -166,23 +165,6 @@ void BlockModel::Update(const Buffer &buf) { nullptr // offset ); -#ifndef NDEBUG - if (buf.normals.size() < buf.vertices.size()) { - std::cerr << "BlockModel: not enough normals!" << std::endl; - } -#endif - glBindBuffer(GL_ARRAY_BUFFER, handle[ATTRIB_NORMAL]); - glBufferData(GL_ARRAY_BUFFER, buf.normals.size() * sizeof(glm::vec3), buf.normals.data(), GL_STATIC_DRAW); - glEnableVertexAttribArray(ATTRIB_NORMAL); - glVertexAttribPointer( - ATTRIB_NORMAL, // location (for shader) - 3, // size - GL_FLOAT, // type - GL_FALSE, // normalized - 0, // stride - nullptr // offset - ); - #ifndef NDEBUG if (buf.lights.size() < buf.vertices.size()) { std::cerr << "BlockModel: not enough lights!" << std::endl; @@ -208,7 +190,6 @@ void BlockModel::Update(const Buffer &buf) { void BlockModel::Draw() const { glBindVertexArray(va); - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, handle[ATTRIB_INDEX]); glDrawElements( GL_TRIANGLES, // how count, // count @@ -296,7 +277,6 @@ void OutlineModel::Draw() { glEnable(GL_LINE_SMOOTH); glLineWidth(2.0f); - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, handle[ATTRIB_INDEX]); glDrawElements( GL_LINES, // how indices.size(), // count