block place/remove timers

[blank.git] / src / model.cpp

diff --git a/src/model.cpp b/src/model.cpp
index d26968a0e6282e51cdcb9dda431eb90a751d4c33..4e75674256d59a25e05fbbe042b89dee5b0ef86b 100644 (file)
--- a/src/model.cpp
+++ b/src/model.cpp
@@ -5,20 +5,20 @@
 
 namespace blank {
 
-Model::Model()
-:  va(0)
+Model::Model() noexcept
+: va(0)
 , handle{}
 , count(0) {
        glGenVertexArrays(1, &va);
        glGenBuffers(ATTRIB_COUNT, handle);
 }
 
-Model::~Model() {
+Model::~Model() noexcept {
        glDeleteBuffers(ATTRIB_COUNT, handle);
        glDeleteVertexArrays(1, &va);
 }
 
-Model::Model(Model &&other)
+Model::Model(Model &&other) noexcept
 : va(other.va)
 , count(other.count) {
        other.va = 0;
@@ -28,7 +28,7 @@ Model::Model(Model &&other)
        }
 }
 
-Model &Model::operator =(Model &&other) {
+Model &Model::operator =(Model &&other) noexcept {
        std::swap(va, other.va);
        for (int i = 0; i < ATTRIB_COUNT; ++i) {
                std::swap(handle[i], other.handle[i]);
@@ -37,7 +37,7 @@ Model &Model::operator =(Model &&other) {
        return *this;
 }
 
-void Model::Update(const Buffer &buf) {
+void Model::Update(const Buffer &buf) noexcept {
        glBindVertexArray(va);
        glBindBuffer(GL_ARRAY_BUFFER, handle[ATTRIB_VERTEX]);
        glBufferData(GL_ARRAY_BUFFER, buf.vertices.size() * sizeof(glm::vec3), buf.vertices.data(), GL_STATIC_DRAW);
@@ -91,9 +91,8 @@ void Model::Update(const Buffer &buf) {
 }
 
 
-void Model::Draw() const {
+void Model::Draw() const noexcept {
        glBindVertexArray(va);
-       glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, handle[ATTRIB_INDEX]);
        glDrawElements(
                GL_TRIANGLES,    // how
                count,           // count
@@ -103,7 +102,103 @@ void Model::Draw() const {
 }
 
 
-OutlineModel::OutlineModel()
+BlockModel::BlockModel() noexcept
+: va(0)
+, handle{}
+, count(0) {
+       glGenVertexArrays(1, &va);
+       glGenBuffers(ATTRIB_COUNT, handle);
+}
+
+BlockModel::~BlockModel() noexcept {
+       glDeleteBuffers(ATTRIB_COUNT, handle);
+       glDeleteVertexArrays(1, &va);
+}
+
+BlockModel::BlockModel(BlockModel &&other) noexcept
+: va(other.va)
+, count(other.count) {
+       other.va = 0;
+       for (int i = 0; i < ATTRIB_COUNT; ++i) {
+               handle[i] = other.handle[i];
+               other.handle[i] = 0;
+       }
+}
+
+BlockModel &BlockModel::operator =(BlockModel &&other) noexcept {
+       std::swap(va, other.va);
+       for (int i = 0; i < ATTRIB_COUNT; ++i) {
+               std::swap(handle[i], other.handle[i]);
+       }
+       count = other.count;
+       return *this;
+}
+
+void BlockModel::Update(const Buffer &buf) noexcept {
+       glBindVertexArray(va);
+       glBindBuffer(GL_ARRAY_BUFFER, handle[ATTRIB_VERTEX]);
+       glBufferData(GL_ARRAY_BUFFER, buf.vertices.size() * sizeof(glm::vec3), buf.vertices.data(), GL_STATIC_DRAW);
+       glEnableVertexAttribArray(ATTRIB_VERTEX);
+       glVertexAttribPointer(
+               ATTRIB_VERTEX, // location (for shader)
+               3,             // size
+               GL_FLOAT,      // type
+               GL_FALSE,      // normalized
+               0,             // stride
+               nullptr        // offset
+       );
+
+#ifndef NDEBUG
+       if (buf.colors.size() < buf.vertices.size()) {
+               std::cerr << "BlockModel: not enough colors!" << std::endl;
+       }
+#endif
+       glBindBuffer(GL_ARRAY_BUFFER, handle[ATTRIB_COLOR]);
+       glBufferData(GL_ARRAY_BUFFER, buf.colors.size() * sizeof(glm::vec3), buf.colors.data(), GL_STATIC_DRAW);
+       glEnableVertexAttribArray(ATTRIB_COLOR);
+       glVertexAttribPointer(
+               ATTRIB_COLOR,  // 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;
+       }
+#endif
+       glBindBuffer(GL_ARRAY_BUFFER, handle[ATTRIB_LIGHT]);
+       glBufferData(GL_ARRAY_BUFFER, buf.lights.size() * sizeof(float), buf.lights.data(), GL_STATIC_DRAW);
+       glEnableVertexAttribArray(ATTRIB_LIGHT);
+       glVertexAttribPointer(
+               ATTRIB_LIGHT, // location (for shader)
+               1,            // size
+               GL_FLOAT,     // type
+               GL_FALSE,     // normalized
+               0,            // stride
+               nullptr       // offset
+       );
+
+       glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, handle[ATTRIB_INDEX]);
+       glBufferData(GL_ELEMENT_ARRAY_BUFFER, buf.indices.size() * sizeof(Index), buf.indices.data(), GL_STATIC_DRAW);
+       count = buf.indices.size();
+}
+
+
+void BlockModel::Draw() const noexcept {
+       glBindVertexArray(va);
+       glDrawElements(
+               GL_TRIANGLES,    // how
+               count,           // count
+               GL_UNSIGNED_INT, // type
+               nullptr          // offset
+       );
+}
+
+OutlineModel::OutlineModel() noexcept
 : vertices()
 , colors()
 , indices()
@@ -114,13 +209,13 @@ OutlineModel::OutlineModel()
        glGenBuffers(ATTRIB_COUNT, handle);
 }
 
-OutlineModel::~OutlineModel() {
+OutlineModel::~OutlineModel() noexcept {
        glDeleteBuffers(ATTRIB_COUNT, handle);
        glDeleteVertexArrays(1, &va);
 }
 
 
-void OutlineModel::Clear() {
+void OutlineModel::Clear() noexcept {
        vertices.clear();
        colors.clear();
        indices.clear();
@@ -134,7 +229,7 @@ void OutlineModel::Reserve(int v, int i) {
 }
 
 
-void OutlineModel::Update() {
+void OutlineModel::Update() noexcept {
        glBindBuffer(GL_ARRAY_BUFFER, handle[ATTRIB_VERTEX]);
        glBufferData(GL_ARRAY_BUFFER, vertices.size() * sizeof(glm::vec3), vertices.data(), GL_STATIC_DRAW);
        glEnableVertexAttribArray(ATTRIB_VERTEX);
@@ -172,7 +267,7 @@ void OutlineModel::Update() {
 }
 
 
-void OutlineModel::Draw() {
+void OutlineModel::Draw() noexcept {
        glBindVertexArray(va);
 
        if (dirty) {
@@ -182,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