move outline definition to block type

diff --git a/src/app.cpp b/src/app.cpp
index 8c40c61fbc5ab2c74ea00257ff40fe4823b79264..5463f7f61c65f560eaf3cd4f2911da862e15be67 100644 (file)
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -46,23 +46,6 @@ Application::Application()
 
        world.Generate();
 
-       outline.vertices = std::vector<glm::vec3>({
-               { 0.0f, 0.0f, 0.0f }, { 1.0f, 0.0f, 0.0f },
-               { 1.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 0.0f },
-               { 1.0f, 1.0f, 0.0f }, { 0.0f, 1.0f, 0.0f },
-               { 0.0f, 1.0f, 0.0f }, { 0.0f, 0.0f, 0.0f },
-               { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 1.0f },
-               { 1.0f, 0.0f, 0.0f }, { 1.0f, 0.0f, 1.0f },
-               { 1.0f, 1.0f, 0.0f }, { 1.0f, 1.0f, 1.0f },
-               { 0.0f, 1.0f, 0.0f }, { 0.0f, 1.0f, 1.0f },
-               { 0.0f, 0.0f, 1.0f }, { 1.0f, 0.0f, 1.0f },
-               { 1.0f, 0.0f, 1.0f }, { 1.0f, 1.0f, 1.0f },
-               { 1.0f, 1.0f, 1.0f }, { 0.0f, 1.0f, 1.0f },
-               { 0.0f, 1.0f, 1.0f }, { 0.0f, 0.0f, 1.0f },
-       });
-       outline.colors.resize(24, { -1, -1, -1 });
-       outline.Invalidate();
-
        glClearColor(0.0, 0.0, 0.0, 1.0);
 }
 
@@ -176,6 +159,7 @@ void Application::Update(int dt) {
        if (world.Intersection(aim, glm::mat4(1.0f), &chunk, &blkid, &dist, &normal)) {
                glm::vec3 pos = Chunk::ToCoords(blkid);
                outline_visible = true;
+               chunk->BlockAt(blkid).type->FillOutlineModel(outline);
                outline_transform = glm::translate(chunk->Transform(), pos);
        } else {
                outline_visible = false;

diff --git a/src/world.cpp b/src/world.cpp
index c24450cdb154e93d460cb4405146f8d3d8d08096..2ac65abf696164405406c8f238bcf1d7cbd6efe6 100644 (file)
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -61,6 +61,27 @@ void BlockType::FillVBO(
        normals.insert(normals.end(), 6, glm::vec3( 1.0f,  0.0f,  0.0f)); // right
 }
 
+void BlockType::FillOutlineVBO(
+       std::vector<glm::vec3> &vertices,
+       std::vector<glm::vec3> &colors
+) const {
+       vertices = std::vector<glm::vec3>({
+               { 0.0f, 0.0f, 0.0f }, { 1.0f, 0.0f, 0.0f },
+               { 1.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 0.0f },
+               { 1.0f, 1.0f, 0.0f }, { 0.0f, 1.0f, 0.0f },
+               { 0.0f, 1.0f, 0.0f }, { 0.0f, 0.0f, 0.0f },
+               { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 1.0f },
+               { 1.0f, 0.0f, 0.0f }, { 1.0f, 0.0f, 1.0f },
+               { 1.0f, 1.0f, 0.0f }, { 1.0f, 1.0f, 1.0f },
+               { 0.0f, 1.0f, 0.0f }, { 0.0f, 1.0f, 1.0f },
+               { 0.0f, 0.0f, 1.0f }, { 1.0f, 0.0f, 1.0f },
+               { 1.0f, 0.0f, 1.0f }, { 1.0f, 1.0f, 1.0f },
+               { 1.0f, 1.0f, 1.0f }, { 0.0f, 1.0f, 1.0f },
+               { 0.0f, 1.0f, 1.0f }, { 0.0f, 0.0f, 1.0f },
+       });
+       colors.resize(24, outline_color);
+}
+
 
 BlockTypeRegistry::BlockTypeRegistry() {
        Add(BlockType::DEFAULT);

diff --git a/src/world.hpp b/src/world.hpp
index 9f29ab4ee4ff09b579689765b96872a2eb5f8766..9fb07798c3f976569d4052cb916dc359d702adca 100644 (file)
--- a/src/world.hpp
+++ b/src/world.hpp
@@ -19,11 +19,13 @@ struct BlockType {
 
        bool visible;
        glm::vec3 color;
+       glm::vec3 outline_color;
 
        constexpr explicit BlockType(
                bool v = false,
-               const glm::vec3 &color = { 1, 1, 1 })
-       : id(-1), visible(v), color(color) { }
+               const glm::vec3 &color = { 1, 1, 1 },
+               const glm::vec3 &outline_color = { -1, -1, -1 })
+       : id(-1), visible(v), color(color), outline_color(outline_color) { }
 
        static const BlockType DEFAULT;
 
@@ -37,6 +39,18 @@ struct BlockType {
 
        void FillModel(const glm::vec3 &pos, Model &m) const {
                FillVBO(pos, m.vertices, m.colors, m.normals);
+               m.Invalidate();
+       }
+
+
+       void FillOutlineVBO(
+               std::vector<glm::vec3> &vertices,
+               std::vector<glm::vec3> &colors
+       ) const;
+
+       void FillOutlineModel(OutlineModel &m) const {
+               FillOutlineVBO(m.vertices, m.colors);
+               m.Invalidate();
        }
 
 };