devirtualize shape and outline calls

diff --git a/src/model.hpp b/src/model.hpp
index ea9bf119e80e6061084117edb0e1c11549a8b1a0..62f467c4f787a6de9547f450af12197dd3e955f6 100644 (file)
--- a/src/model.hpp
+++ b/src/model.hpp
@@ -11,13 +11,21 @@ namespace blank {
 class Model {
 
 public:
+       using Position = glm::vec3;
+       using Color = glm::vec3;
+       using Normal = glm::vec3;
        using Index = unsigned int;
 
+       using Positions = std::vector<Position>;
+       using Colors = std::vector<Color>;
+       using Normals = std::vector<Normal>;
+       using Indices = std::vector<Index>;
+
 public:
-       std::vector<glm::vec3> vertices;
-       std::vector<glm::vec3> colors;
-       std::vector<glm::vec3> normals;
-       std::vector<Index> indices;
+       Positions vertices;
+       Colors colors;
+       Normals normals;
+       Indices indices;
 
 public:
        Model();
@@ -59,12 +67,18 @@ private:
 class OutlineModel {
 
 public:
+       using Position = glm::vec3;
+       using Color = glm::vec3;
        using Index = unsigned short;
 
+       using Positions = std::vector<Position>;
+       using Colors = std::vector<Color>;
+       using Indices = std::vector<Index>;
+
 public:
-       std::vector<glm::vec3> vertices;
-       std::vector<glm::vec3> colors;
-       std::vector<Index> indices;
+       Positions vertices;
+       Colors colors;
+       Indices indices;
 
 public:
        OutlineModel();

diff --git a/src/shape.cpp b/src/shape.cpp
index 615b8f9cc719088d8ff405e3638b9ce4312d4918..c96a07422d6c8407721010449c182b3798169857 100644 (file)
--- a/src/shape.cpp
+++ b/src/shape.cpp
@@ -3,27 +3,39 @@
 
 namespace blank {
 
-NullShape::NullShape()
-: Shape(0, 0, 0, 0) {
-
+void Shape::Vertices(
+       Model::Positions &vertex,
+       Model::Normals &normal,
+       Model::Indices &index,
+       const Model::Position &elem_offset,
+       Model::Index idx_offset
+) const {
+       for (const auto &pos : vtx_pos) {
+               vertex.emplace_back(elem_offset + pos);
+       }
+       normal.insert(normal.end(), vtx_nrm.begin(), vtx_nrm.end());
+       for (auto idx : vtx_idx) {
+               index.emplace_back(idx_offset + idx);
+       }
 }
 
-void NullShape::Vertices(
-       std::vector<glm::vec3> &,
-       std::vector<glm::vec3> &,
-       std::vector<Model::Index> &,
-       const glm::vec3 &,
-       Model::Index
+void Shape::Outline(
+       OutlineModel::Positions &vertex,
+       OutlineModel::Indices &index,
+       const OutlineModel::Position &elem_offset,
+       OutlineModel::Index idx_offset
 ) const {
-
+       for (const auto &pos : out_pos) {
+               vertex.emplace_back(elem_offset + pos);
+       }
+       for (auto idx : out_idx) {
+               index.emplace_back(idx_offset + idx);
+       }
 }
 
-void NullShape::Outline(
-       std::vector<glm::vec3> &,
-       std::vector<OutlineModel::Index> &,
-       const glm::vec3 &,
-       OutlineModel::Index
-) const {
+
+NullShape::NullShape()
+: Shape() {
 
 }
 
@@ -37,127 +49,81 @@ bool NullShape::Intersects(
 
 
 CuboidShape::CuboidShape(const AABB &b)
-: Shape(24, 36, 8, 24)
+: Shape()
 , bb(b) {
        bb.Adjust();
-}
-
-void CuboidShape::Vertices(
-       std::vector<glm::vec3> &vtx,
-       std::vector<glm::vec3> &norm,
-       std::vector<Model::Index> &index,
-       const glm::vec3 &pos,
-       Model::Index idx
-) const {
-       vtx.emplace_back(pos.x + bb.min.x, pos.y + bb.min.y, pos.z + bb.max.z); // front
-       vtx.emplace_back(pos.x + bb.max.x, pos.y + bb.min.y, pos.z + bb.max.z);
-       vtx.emplace_back(pos.x + bb.min.x, pos.y + bb.max.y, pos.z + bb.max.z);
-       vtx.emplace_back(pos.x + bb.max.x, pos.y + bb.max.y, pos.z + bb.max.z);
-       vtx.emplace_back(pos.x + bb.min.x, pos.y + bb.min.y, pos.z + bb.min.z); // back
-       vtx.emplace_back(pos.x + bb.min.x, pos.y + bb.max.y, pos.z + bb.min.z);
-       vtx.emplace_back(pos.x + bb.max.x, pos.y + bb.min.y, pos.z + bb.min.z);
-       vtx.emplace_back(pos.x + bb.max.x, pos.y + bb.max.y, pos.z + bb.min.z);
-       vtx.emplace_back(pos.x + bb.min.x, pos.y + bb.max.y, pos.z + bb.min.z); // top
-       vtx.emplace_back(pos.x + bb.min.x, pos.y + bb.max.y, pos.z + bb.max.z);
-       vtx.emplace_back(pos.x + bb.max.x, pos.y + bb.max.y, pos.z + bb.min.z);
-       vtx.emplace_back(pos.x + bb.max.x, pos.y + bb.max.y, pos.z + bb.max.z);
-       vtx.emplace_back(pos.x + bb.min.x, pos.y + bb.min.y, pos.z + bb.min.z); // bottom
-       vtx.emplace_back(pos.x + bb.max.x, pos.y + bb.min.y, pos.z + bb.min.z);
-       vtx.emplace_back(pos.x + bb.min.x, pos.y + bb.min.y, pos.z + bb.max.z);
-       vtx.emplace_back(pos.x + bb.max.x, pos.y + bb.min.y, pos.z + bb.max.z);
-       vtx.emplace_back(pos.x + bb.min.x, pos.y + bb.min.y, pos.z + bb.min.z); // left
-       vtx.emplace_back(pos.x + bb.min.x, pos.y + bb.min.y, pos.z + bb.max.z);
-       vtx.emplace_back(pos.x + bb.min.x, pos.y + bb.max.y, pos.z + bb.min.z);
-       vtx.emplace_back(pos.x + bb.min.x, pos.y + bb.max.y, pos.z + bb.max.z);
-       vtx.emplace_back(pos.x + bb.max.x, pos.y + bb.min.y, pos.z + bb.min.z); // right
-       vtx.emplace_back(pos.x + bb.max.x, pos.y + bb.max.y, pos.z + bb.min.z);
-       vtx.emplace_back(pos.x + bb.max.x, pos.y + bb.min.y, pos.z + bb.max.z);
-       vtx.emplace_back(pos.x + bb.max.x, pos.y + bb.max.y, pos.z + bb.max.z);
-
-       norm.insert(norm.end(), 4, glm::vec3( 0.0f,  0.0f,  1.0f)); // front
-       norm.insert(norm.end(), 4, glm::vec3( 0.0f,  0.0f, -1.0f)); // back
-       norm.insert(norm.end(), 4, glm::vec3( 0.0f,  1.0f,  0.0f)); // top
-       norm.insert(norm.end(), 4, glm::vec3( 0.0f, -1.0f,  0.0f)); // bottom
-       norm.insert(norm.end(), 4, glm::vec3(-1.0f,  0.0f,  0.0f)); // left
-       norm.insert(norm.end(), 4, glm::vec3( 1.0f,  0.0f,  0.0f)); // right
-
-       index.emplace_back(idx +  0); // front
-       index.emplace_back(idx +  1);
-       index.emplace_back(idx +  2);
-       index.emplace_back(idx +  2);
-       index.emplace_back(idx +  1);
-       index.emplace_back(idx +  3);
-       index.emplace_back(idx +  4); // back
-       index.emplace_back(idx +  5);
-       index.emplace_back(idx +  6);
-       index.emplace_back(idx +  6);
-       index.emplace_back(idx +  5);
-       index.emplace_back(idx +  7);
-       index.emplace_back(idx +  8); // top
-       index.emplace_back(idx +  9);
-       index.emplace_back(idx + 10);
-       index.emplace_back(idx + 10);
-       index.emplace_back(idx +  9);
-       index.emplace_back(idx + 11);
-       index.emplace_back(idx + 12); // bottom
-       index.emplace_back(idx + 13);
-       index.emplace_back(idx + 14);
-       index.emplace_back(idx + 14);
-       index.emplace_back(idx + 13);
-       index.emplace_back(idx + 15);
-       index.emplace_back(idx + 16); // left
-       index.emplace_back(idx + 17);
-       index.emplace_back(idx + 18);
-       index.emplace_back(idx + 18);
-       index.emplace_back(idx + 17);
-       index.emplace_back(idx + 19);
-       index.emplace_back(idx + 20); // right
-       index.emplace_back(idx + 21);
-       index.emplace_back(idx + 22);
-       index.emplace_back(idx + 22);
-       index.emplace_back(idx + 21);
-       index.emplace_back(idx + 23);
-}
-
-void CuboidShape::Outline(
-       std::vector<glm::vec3> &vtx,
-       std::vector<OutlineModel::Index> &index,
-       const glm::vec3 &pos,
-       OutlineModel::Index idx
-) const {
-       vtx.emplace_back(pos.x + bb.min.x, pos.y + bb.min.y, pos.z + bb.min.z); // back
-       vtx.emplace_back(pos.x + bb.max.x, pos.y + bb.min.y, pos.z + bb.min.z);
-       vtx.emplace_back(pos.x + bb.min.x, pos.y + bb.max.y, pos.z + bb.min.z);
-       vtx.emplace_back(pos.x + bb.max.x, pos.y + bb.max.y, pos.z + bb.min.z);
-       vtx.emplace_back(pos.x + bb.min.x, pos.y + bb.min.y, pos.z + bb.max.z); // front
-       vtx.emplace_back(pos.x + bb.max.x, pos.y + bb.min.y, pos.z + bb.max.z);
-       vtx.emplace_back(pos.x + bb.min.x, pos.y + bb.max.y, pos.z + bb.max.z);
-       vtx.emplace_back(pos.x + bb.max.x, pos.y + bb.max.y, pos.z + bb.max.z);
-
-       index.emplace_back(idx +  0); // back
-       index.emplace_back(idx +  1);
-       index.emplace_back(idx +  1);
-       index.emplace_back(idx +  3);
-       index.emplace_back(idx +  3);
-       index.emplace_back(idx +  2);
-       index.emplace_back(idx +  2);
-       index.emplace_back(idx +  0);
-       index.emplace_back(idx +  4); // front
-       index.emplace_back(idx +  5);
-       index.emplace_back(idx +  5);
-       index.emplace_back(idx +  7);
-       index.emplace_back(idx +  7);
-       index.emplace_back(idx +  6);
-       index.emplace_back(idx +  6);
-       index.emplace_back(idx +  4);
-       index.emplace_back(idx +  0); // sides
-       index.emplace_back(idx +  4);
-       index.emplace_back(idx +  1);
-       index.emplace_back(idx +  5);
-       index.emplace_back(idx +  2);
-       index.emplace_back(idx +  6);
-       index.emplace_back(idx +  3);
-       index.emplace_back(idx +  7);
+       SetShape({
+               { bb.min.x, bb.min.y, bb.max.z }, // front
+               { bb.max.x, bb.min.y, bb.max.z },
+               { bb.min.x, bb.max.y, bb.max.z },
+               { bb.max.x, bb.max.y, bb.max.z },
+               { bb.min.x, bb.min.y, bb.min.z }, // back
+               { bb.min.x, bb.max.y, bb.min.z },
+               { bb.max.x, bb.min.y, bb.min.z },
+               { bb.max.x, bb.max.y, bb.min.z },
+               { bb.min.x, bb.max.y, bb.min.z }, // top
+               { bb.min.x, bb.max.y, bb.max.z },
+               { bb.max.x, bb.max.y, bb.min.z },
+               { bb.max.x, bb.max.y, bb.max.z },
+               { bb.min.x, bb.min.y, bb.min.z }, // bottom
+               { bb.max.x, bb.min.y, bb.min.z },
+               { bb.min.x, bb.min.y, bb.max.z },
+               { bb.max.x, bb.min.y, bb.max.z },
+               { bb.min.x, bb.min.y, bb.min.z }, // left
+               { bb.min.x, bb.min.y, bb.max.z },
+               { bb.min.x, bb.max.y, bb.min.z },
+               { bb.min.x, bb.max.y, bb.max.z },
+               { bb.max.x, bb.min.y, bb.min.z }, // right
+               { bb.max.x, bb.max.y, bb.min.z },
+               { bb.max.x, bb.min.y, bb.max.z },
+               { bb.max.x, bb.max.y, bb.max.z },
+       }, {
+               {  0.0f,  0.0f,  1.0f }, // front
+               {  0.0f,  0.0f,  1.0f },
+               {  0.0f,  0.0f,  1.0f },
+               {  0.0f,  0.0f,  1.0f },
+               {  0.0f,  0.0f, -1.0f }, // back
+               {  0.0f,  0.0f, -1.0f },
+               {  0.0f,  0.0f, -1.0f },
+               {  0.0f,  0.0f, -1.0f },
+               {  0.0f,  1.0f,  0.0f }, // top
+               {  0.0f,  1.0f,  0.0f },
+               {  0.0f,  1.0f,  0.0f },
+               {  0.0f,  1.0f,  0.0f },
+               {  0.0f, -1.0f,  0.0f }, // bottom
+               {  0.0f, -1.0f,  0.0f },
+               {  0.0f, -1.0f,  0.0f },
+               {  0.0f, -1.0f,  0.0f },
+               { -1.0f,  0.0f,  0.0f }, // left
+               { -1.0f,  0.0f,  0.0f },
+               { -1.0f,  0.0f,  0.0f },
+               { -1.0f,  0.0f,  0.0f },
+               {  1.0f,  0.0f,  0.0f }, // right
+               {  1.0f,  0.0f,  0.0f },
+               {  1.0f,  0.0f,  0.0f },
+               {  1.0f,  0.0f,  0.0f },
+       }, {
+                 0,  1,  2,  2,  1,  3, // front
+                 4,  5,  6,  6,  5,  7, // back
+                 8,  9, 10, 10,  9, 11, // top
+                12, 13, 14, 14, 13, 15, // bottom
+                16, 17, 18, 18, 17, 19, // left
+                20, 21, 22, 22, 21, 23, // right
+       });
+       SetOutline({
+               { bb.min.x, bb.min.y, bb.min.z }, // back
+               { bb.max.x, bb.min.y, bb.min.z },
+               { bb.min.x, bb.max.y, bb.min.z },
+               { bb.max.x, bb.max.y, bb.min.z },
+               { bb.min.x, bb.min.y, bb.max.z }, // front
+               { bb.max.x, bb.min.y, bb.max.z },
+               { bb.min.x, bb.max.y, bb.max.z },
+               { bb.max.x, bb.max.y, bb.max.z },
+       }, {
+               0, 1, 1, 3, 3, 2, 2, 0, // back
+               4, 5, 5, 7, 7, 6, 6, 4, // front
+               0, 4, 1, 5, 2, 6, 3, 7, // sides
+       });
 }
 
 bool CuboidShape::Intersects(
@@ -170,185 +136,124 @@ bool CuboidShape::Intersects(
 
 
 StairShape::StairShape(const AABB &bb, const glm::vec2 &clip)
-: Shape(40, 60, 12, 36)
+: Shape()
 , top({ { clip.x, clip.y, bb.min.z }, bb.max })
 , bot({ bb.min, { bb.max.x, clip.y, bb.max.z } }) {
-
-}
-
-
-void StairShape::Vertices(
-       std::vector<glm::vec3> &vtx,
-       std::vector<glm::vec3> &norm,
-       std::vector<Model::Index> &index,
-       const glm::vec3 &pos,
-       Model::Index idx
-) const {
-       vtx.emplace_back(pos.x + top.min.x, pos.y + top.min.y, pos.z + top.max.z); // front, upper
-       vtx.emplace_back(pos.x + top.max.x, pos.y + top.min.y, pos.z + top.max.z);
-       vtx.emplace_back(pos.x + top.min.x, pos.y + top.max.y, pos.z + top.max.z);
-       vtx.emplace_back(pos.x + top.max.x, pos.y + top.max.y, pos.z + top.max.z);
-       vtx.emplace_back(pos.x + bot.min.x, pos.y + bot.min.y, pos.z + bot.max.z); // front, lower
-       vtx.emplace_back(pos.x + bot.max.x, pos.y + bot.min.y, pos.z + bot.max.z);
-       vtx.emplace_back(pos.x + bot.min.x, pos.y + bot.max.y, pos.z + bot.max.z);
-       vtx.emplace_back(pos.x + bot.max.x, pos.y + bot.max.y, pos.z + bot.max.z);
-       vtx.emplace_back(pos.x + top.min.x, pos.y + top.min.y, pos.z + top.min.z); // back, upper
-       vtx.emplace_back(pos.x + top.min.x, pos.y + top.max.y, pos.z + top.min.z);
-       vtx.emplace_back(pos.x + top.max.x, pos.y + top.min.y, pos.z + top.min.z);
-       vtx.emplace_back(pos.x + top.max.x, pos.y + top.max.y, pos.z + top.min.z);
-       vtx.emplace_back(pos.x + bot.min.x, pos.y + bot.min.y, pos.z + bot.min.z); // back, lower
-       vtx.emplace_back(pos.x + bot.min.x, pos.y + bot.max.y, pos.z + bot.min.z);
-       vtx.emplace_back(pos.x + bot.max.x, pos.y + bot.min.y, pos.z + bot.min.z);
-       vtx.emplace_back(pos.x + bot.max.x, pos.y + bot.max.y, pos.z + bot.min.z);
-       vtx.emplace_back(pos.x + top.min.x, pos.y + top.max.y, pos.z + top.min.z); // top, upper
-       vtx.emplace_back(pos.x + top.min.x, pos.y + top.max.y, pos.z + top.max.z);
-       vtx.emplace_back(pos.x + top.max.x, pos.y + top.max.y, pos.z + top.min.z);
-       vtx.emplace_back(pos.x + top.max.x, pos.y + top.max.y, pos.z + top.max.z);
-       vtx.emplace_back(pos.x + bot.min.x, pos.y + bot.max.y, pos.z + bot.min.z); // top, lower
-       vtx.emplace_back(pos.x + bot.min.x, pos.y + bot.max.y, pos.z + bot.max.z);
-       vtx.emplace_back(pos.x + top.min.x, pos.y + bot.max.y, pos.z + bot.min.z);
-       vtx.emplace_back(pos.x + top.min.x, pos.y + bot.max.y, pos.z + bot.max.z);
-       vtx.emplace_back(pos.x + bot.min.x, pos.y + bot.min.y, pos.z + bot.min.z); // bottom
-       vtx.emplace_back(pos.x + bot.max.x, pos.y + bot.min.y, pos.z + bot.min.z);
-       vtx.emplace_back(pos.x + bot.min.x, pos.y + bot.min.y, pos.z + bot.max.z);
-       vtx.emplace_back(pos.x + bot.max.x, pos.y + bot.min.y, pos.z + bot.max.z);
-       vtx.emplace_back(pos.x + top.min.x, pos.y + top.min.y, pos.z + top.min.z); // left, upper
-       vtx.emplace_back(pos.x + top.min.x, pos.y + top.min.y, pos.z + top.max.z);
-       vtx.emplace_back(pos.x + top.min.x, pos.y + top.max.y, pos.z + top.min.z);
-       vtx.emplace_back(pos.x + top.min.x, pos.y + top.max.y, pos.z + top.max.z);
-       vtx.emplace_back(pos.x + bot.min.x, pos.y + bot.min.y, pos.z + bot.min.z); // left, lower
-       vtx.emplace_back(pos.x + bot.min.x, pos.y + bot.min.y, pos.z + bot.max.z);
-       vtx.emplace_back(pos.x + bot.min.x, pos.y + bot.max.y, pos.z + bot.min.z);
-       vtx.emplace_back(pos.x + bot.min.x, pos.y + bot.max.y, pos.z + bot.max.z);
-       vtx.emplace_back(pos.x + bot.max.x, pos.y + bot.min.y, pos.z + bot.min.z); // right
-       vtx.emplace_back(pos.x + bot.max.x, pos.y + top.max.y, pos.z + bot.min.z);
-       vtx.emplace_back(pos.x + bot.max.x, pos.y + bot.min.y, pos.z + bot.max.z);
-       vtx.emplace_back(pos.x + bot.max.x, pos.y + top.max.y, pos.z + bot.max.z);
-
-       norm.insert(norm.end(), 8, glm::vec3( 0.0f,  0.0f,  1.0f)); // front, x2
-       norm.insert(norm.end(), 8, glm::vec3( 0.0f,  0.0f, -1.0f)); // back, x2
-       norm.insert(norm.end(), 8, glm::vec3( 0.0f,  1.0f,  0.0f)); // top, x2
-       norm.insert(norm.end(), 4, glm::vec3( 0.0f, -1.0f,  0.0f)); // bottom
-       norm.insert(norm.end(), 8, glm::vec3(-1.0f,  0.0f,  0.0f)); // left, x2
-       norm.insert(norm.end(), 4, glm::vec3( 1.0f,  0.0f,  0.0f)); // right
-
-       index.emplace_back(idx +  0); // front, upper
-       index.emplace_back(idx +  1);
-       index.emplace_back(idx +  2);
-       index.emplace_back(idx +  2);
-       index.emplace_back(idx +  1);
-       index.emplace_back(idx +  3);
-       index.emplace_back(idx +  4); // front, lower
-       index.emplace_back(idx +  5);
-       index.emplace_back(idx +  6);
-       index.emplace_back(idx +  6);
-       index.emplace_back(idx +  5);
-       index.emplace_back(idx +  7);
-       index.emplace_back(idx +  8); // back, upper
-       index.emplace_back(idx +  9);
-       index.emplace_back(idx + 10);
-       index.emplace_back(idx + 10);
-       index.emplace_back(idx +  9);
-       index.emplace_back(idx + 11);
-       index.emplace_back(idx + 12); // back, lower
-       index.emplace_back(idx + 13);
-       index.emplace_back(idx + 14);
-       index.emplace_back(idx + 14);
-       index.emplace_back(idx + 13);
-       index.emplace_back(idx + 15);
-       index.emplace_back(idx + 16); // top, upper
-       index.emplace_back(idx + 17);
-       index.emplace_back(idx + 18);
-       index.emplace_back(idx + 18);
-       index.emplace_back(idx + 17);
-       index.emplace_back(idx + 19);
-       index.emplace_back(idx + 20); // top, lower
-       index.emplace_back(idx + 21);
-       index.emplace_back(idx + 22);
-       index.emplace_back(idx + 22);
-       index.emplace_back(idx + 21);
-       index.emplace_back(idx + 23);
-       index.emplace_back(idx + 24); // bottom
-       index.emplace_back(idx + 25);
-       index.emplace_back(idx + 26);
-       index.emplace_back(idx + 26);
-       index.emplace_back(idx + 25);
-       index.emplace_back(idx + 27);
-       index.emplace_back(idx + 28); // left, upper
-       index.emplace_back(idx + 29);
-       index.emplace_back(idx + 30);
-       index.emplace_back(idx + 30);
-       index.emplace_back(idx + 29);
-       index.emplace_back(idx + 31);
-       index.emplace_back(idx + 32); // left, lower
-       index.emplace_back(idx + 33);
-       index.emplace_back(idx + 34);
-       index.emplace_back(idx + 34);
-       index.emplace_back(idx + 33);
-       index.emplace_back(idx + 35);
-       index.emplace_back(idx + 36); // right
-       index.emplace_back(idx + 37);
-       index.emplace_back(idx + 38);
-       index.emplace_back(idx + 38);
-       index.emplace_back(idx + 37);
-       index.emplace_back(idx + 39);
-}
-
-void StairShape::Outline(
-       std::vector<glm::vec3> &vtx,
-       std::vector<OutlineModel::Index> &index,
-       const glm::vec3 &pos,
-       OutlineModel::Index idx
-) const {
-       vtx.emplace_back(pos.x + bot.min.x, pos.y + bot.min.y, pos.z + bot.min.z); // bottom
-       vtx.emplace_back(pos.x + bot.max.x, pos.y + bot.min.y, pos.z + bot.min.z);
-       vtx.emplace_back(pos.x + bot.min.x, pos.y + bot.min.y, pos.z + bot.max.z);
-       vtx.emplace_back(pos.x + bot.max.x, pos.y + bot.min.y, pos.z + bot.max.z);
-       vtx.emplace_back(pos.x + bot.min.x, pos.y + bot.max.y, pos.z + bot.min.z); // middle
-       vtx.emplace_back(pos.x + top.min.x, pos.y + bot.max.y, pos.z + bot.min.z);
-       vtx.emplace_back(pos.x + bot.min.x, pos.y + bot.max.y, pos.z + top.max.z);
-       vtx.emplace_back(pos.x + top.min.x, pos.y + bot.max.y, pos.z + top.max.z);
-       vtx.emplace_back(pos.x + top.min.x, pos.y + top.max.y, pos.z + top.min.z); // top
-       vtx.emplace_back(pos.x + top.max.x, pos.y + top.max.y, pos.z + top.min.z);
-       vtx.emplace_back(pos.x + top.min.x, pos.y + top.max.y, pos.z + top.max.z);
-       vtx.emplace_back(pos.x + top.max.x, pos.y + top.max.y, pos.z + top.max.z);
-
-       index.emplace_back(idx +  0); // bottom
-       index.emplace_back(idx +  1);
-       index.emplace_back(idx +  1);
-       index.emplace_back(idx +  3);
-       index.emplace_back(idx +  3);
-       index.emplace_back(idx +  2);
-       index.emplace_back(idx +  2);
-       index.emplace_back(idx +  0);
-       index.emplace_back(idx +  4); // middle
-       index.emplace_back(idx +  5);
-       index.emplace_back(idx +  5);
-       index.emplace_back(idx +  7);
-       index.emplace_back(idx +  7);
-       index.emplace_back(idx +  6);
-       index.emplace_back(idx +  6);
-       index.emplace_back(idx +  4);
-       index.emplace_back(idx +  8); // top
-       index.emplace_back(idx +  9);
-       index.emplace_back(idx +  9);
-       index.emplace_back(idx + 11);
-       index.emplace_back(idx + 11);
-       index.emplace_back(idx + 10);
-       index.emplace_back(idx + 10);
-       index.emplace_back(idx +  8);
-       index.emplace_back(idx +  0); // verticals
-       index.emplace_back(idx +  4);
-       index.emplace_back(idx +  2);
-       index.emplace_back(idx +  6);
-       index.emplace_back(idx +  5);
-       index.emplace_back(idx +  8);
-       index.emplace_back(idx +  7);
-       index.emplace_back(idx + 10);
-       index.emplace_back(idx +  1);
-       index.emplace_back(idx +  9);
-       index.emplace_back(idx +  3);
-       index.emplace_back(idx + 11);
+       SetShape({
+               { top.min.x, top.min.y, top.max.z }, // front, upper
+               { top.max.x, top.min.y, top.max.z },
+               { top.min.x, top.max.y, top.max.z },
+               { top.max.x, top.max.y, top.max.z },
+               { bot.min.x, bot.min.y, bot.max.z }, // front, lower
+               { bot.max.x, bot.min.y, bot.max.z },
+               { bot.min.x, bot.max.y, bot.max.z },
+               { bot.max.x, bot.max.y, bot.max.z },
+               { top.min.x, top.min.y, top.min.z }, // back, upper
+               { top.min.x, top.max.y, top.min.z },
+               { top.max.x, top.min.y, top.min.z },
+               { top.max.x, top.max.y, top.min.z },
+               { bot.min.x, bot.min.y, bot.min.z }, // back, lower
+               { bot.min.x, bot.max.y, bot.min.z },
+               { bot.max.x, bot.min.y, bot.min.z },
+               { bot.max.x, bot.max.y, bot.min.z },
+               { top.min.x, top.max.y, top.min.z }, // top, upper
+               { top.min.x, top.max.y, top.max.z },
+               { top.max.x, top.max.y, top.min.z },
+               { top.max.x, top.max.y, top.max.z },
+               { bot.min.x, bot.max.y, bot.min.z }, // top, lower
+               { bot.min.x, bot.max.y, bot.max.z },
+               { top.min.x, bot.max.y, bot.min.z },
+               { top.min.x, bot.max.y, bot.max.z },
+               { bot.min.x, bot.min.y, bot.min.z }, // bottom
+               { bot.max.x, bot.min.y, bot.min.z },
+               { bot.min.x, bot.min.y, bot.max.z },
+               { bot.max.x, bot.min.y, bot.max.z },
+               { top.min.x, top.min.y, top.min.z }, // left, upper
+               { top.min.x, top.min.y, top.max.z },
+               { top.min.x, top.max.y, top.min.z },
+               { top.min.x, top.max.y, top.max.z },
+               { bot.min.x, bot.min.y, bot.min.z }, // left, lower
+               { bot.min.x, bot.min.y, bot.max.z },
+               { bot.min.x, bot.max.y, bot.min.z },
+               { bot.min.x, bot.max.y, bot.max.z },
+               { bot.max.x, bot.min.y, bot.min.z }, // right
+               { bot.max.x, top.max.y, bot.min.z },
+               { bot.max.x, bot.min.y, bot.max.z },
+               { bot.max.x, top.max.y, bot.max.z },
+       }, {
+               {  0.0f,  0.0f,  1.0f }, // front, x2
+               {  0.0f,  0.0f,  1.0f },
+               {  0.0f,  0.0f,  1.0f },
+               {  0.0f,  0.0f,  1.0f },
+               {  0.0f,  0.0f,  1.0f },
+               {  0.0f,  0.0f,  1.0f },
+               {  0.0f,  0.0f,  1.0f },
+               {  0.0f,  0.0f,  1.0f },
+               {  0.0f,  0.0f, -1.0f }, // back, x2
+               {  0.0f,  0.0f, -1.0f },
+               {  0.0f,  0.0f, -1.0f },
+               {  0.0f,  0.0f, -1.0f },
+               {  0.0f,  0.0f, -1.0f },
+               {  0.0f,  0.0f, -1.0f },
+               {  0.0f,  0.0f, -1.0f },
+               {  0.0f,  0.0f, -1.0f },
+               {  0.0f,  1.0f,  0.0f }, // top, x2
+               {  0.0f,  1.0f,  0.0f },
+               {  0.0f,  1.0f,  0.0f },
+               {  0.0f,  1.0f,  0.0f },
+               {  0.0f,  1.0f,  0.0f },
+               {  0.0f,  1.0f,  0.0f },
+               {  0.0f,  1.0f,  0.0f },
+               {  0.0f,  1.0f,  0.0f },
+               {  0.0f, -1.0f,  0.0f }, // bottom
+               {  0.0f, -1.0f,  0.0f },
+               {  0.0f, -1.0f,  0.0f },
+               {  0.0f, -1.0f,  0.0f },
+               { -1.0f,  0.0f,  0.0f }, // left, x2
+               { -1.0f,  0.0f,  0.0f },
+               { -1.0f,  0.0f,  0.0f },
+               { -1.0f,  0.0f,  0.0f },
+               { -1.0f,  0.0f,  0.0f },
+               { -1.0f,  0.0f,  0.0f },
+               { -1.0f,  0.0f,  0.0f },
+               { -1.0f,  0.0f,  0.0f },
+               {  1.0f,  0.0f,  0.0f }, // right
+               {  1.0f,  0.0f,  0.0f },
+               {  1.0f,  0.0f,  0.0f },
+               {  1.0f,  0.0f,  0.0f },
+       }, {
+                0,  1,  2,  2,  1,  3, // front, upper
+                4,  5,  6,  6,  5,  7, // front, lower
+                8,  9, 10, 10,  9, 11, // back, upper
+               12, 13, 14, 14, 13, 15, // back, lower
+               16, 17, 18, 18, 17, 19, // top, upper
+               20, 21, 22, 22, 21, 23, // top, lower
+               24, 25, 26, 26, 25, 27, // bottom
+               28, 29, 30, 30, 29, 31, // left, upper
+               32, 33, 34, 34, 33, 35, // left, lower
+               36, 37, 38, 38, 37, 39, // right
+       });
+       SetOutline({
+               { bot.min.x, bot.min.y, bot.min.z }, // bottom
+               { bot.max.x, bot.min.y, bot.min.z },
+               { bot.min.x, bot.min.y, bot.max.z },
+               { bot.max.x, bot.min.y, bot.max.z },
+               { bot.min.x, bot.max.y, bot.min.z }, // middle
+               { top.min.x, bot.max.y, bot.min.z },
+               { bot.min.x, bot.max.y, top.max.z },
+               { top.min.x, bot.max.y, top.max.z },
+               { top.min.x, top.max.y, top.min.z }, // top
+               { top.max.x, top.max.y, top.min.z },
+               { top.min.x, top.max.y, top.max.z },
+               { top.max.x, top.max.y, top.max.z },
+       }, {
+                0,  1,  1,  3,  3,  2,  2,  0, // bottom
+                4,  5,  5,  7,  7,  6,  6,  4, // middle
+                8,  9,  9, 11, 11, 10, 10 , 8, // top
+                0,  4,  2,  6, // verticals
+                5,  8,  7, 10,
+                1,  9,  3, 11,
+       });
 }
 
 bool StairShape::Intersects(
@@ -387,5 +292,4 @@ bool StairShape::Intersects(
        }
 }
 
-
 }

diff --git a/src/shape.hpp b/src/shape.hpp
index af19bb12e8ccfbf75fd6205f1e5fecf08e30b6fe..909d1c40691bc6cae174eb4cdcedc7456ad4a3d6 100644 (file)
--- a/src/shape.hpp
+++ b/src/shape.hpp
@@ -13,33 +13,33 @@ namespace blank {
 struct Shape {
 
        /// the number of vertices (and normals) this shape has
-       size_t VertexCount() const { return vtx; }
+       size_t VertexCount() const { return vtx_pos.size(); }
        /// the number of vertex indices this shape has
-       size_t VertexIndexCount() const { return vtx_idx; }
+       size_t VertexIndexCount() const { return vtx_idx.size(); }
 
        /// fill given buffers with this shape's elements with an
        /// optional offset
-       virtual void Vertices(
-               std::vector<glm::vec3> &vertex,
-               std::vector<glm::vec3> &normal,
-               std::vector<Model::Index> &index,
-               const glm::vec3 &elem_offset = { 0.0f, 0.0f, 0.0f },
+       void Vertices(
+               Model::Positions &vertex,
+               Model::Normals &normal,
+               Model::Indices &index,
+               const Model::Position &elem_offset = { 0.0f, 0.0f, 0.0f },
                Model::Index idx_offset = 0
-       ) const = 0;
+       ) const;
 
        /// the number of vertices this shape's outline has
-       size_t OutlineCount() const { return outl; }
+       size_t OutlineCount() const { return out_pos.size(); }
        /// the number of vertex indices this shape's outline has
-       size_t OutlineIndexCount() const { return outl_idx; }
+       size_t OutlineIndexCount() const { return out_idx.size(); }
 
        /// fill given buffers with this shape's outline's elements with
        /// an optional offset
-       virtual void Outline(
-               std::vector<glm::vec3> &vertex,
-               std::vector<OutlineModel::Index> &index,
-               const glm::vec3 &offset = { 0.0f, 0.0f, 0.0f },
+       void Outline(
+               OutlineModel::Positions &vertex,
+               OutlineModel::Indices &index,
+               const OutlineModel::Position &offset = { 0.0f, 0.0f, 0.0f },
                OutlineModel::Index idx_offset = 0
-       ) const = 0;
+       ) const;
 
        /// Check if given ray would pass though this shape if it were
        /// transformed with given matrix.
@@ -53,14 +53,23 @@ struct Shape {
        ) const = 0;
 
 protected:
-       Shape(size_t vtx, size_t vtx_idx, size_t outl, size_t outl_idx)
-       : vtx(vtx), vtx_idx(vtx_idx), outl(outl), outl_idx(outl_idx) { }
+       void SetShape(const Model::Positions &pos, const Model::Normals &nrm, const Model::Indices &idx) {
+               vtx_pos = pos;
+               vtx_nrm = nrm;
+               vtx_idx = idx;
+       }
+       void SetOutline(const OutlineModel::Positions &pos, const OutlineModel::Indices &idx) {
+               out_pos = pos;
+               out_idx = idx;
+       }
 
 private:
-       size_t vtx;
-       size_t vtx_idx;
-       size_t outl;
-       size_t outl_idx;
+       Model::Positions vtx_pos;
+       Model::Normals vtx_nrm;
+       Model::Indices vtx_idx;
+
+       OutlineModel::Positions out_pos;
+       OutlineModel::Indices out_idx;
 
 };
 
@@ -71,21 +80,6 @@ class NullShape
 public:
        NullShape();
 
-       void Vertices(
-               std::vector<glm::vec3> &vertex,
-               std::vector<glm::vec3> &normal,
-               std::vector<Model::Index> &index,
-               const glm::vec3 &elem_offset = { 0.0f, 0.0f, 0.0f },
-               Model::Index idx_offset = 0
-       ) const override;
-
-       void Outline(
-               std::vector<glm::vec3> &vertex,
-               std::vector<OutlineModel::Index> &index,
-               const glm::vec3 &offset = { 0.0f, 0.0f, 0.0f },
-               OutlineModel::Index idx_offset = 0
-       ) const override;
-
        bool Intersects(const Ray &, const glm::mat4 &, float &, glm::vec3 &) const override;
 
 };
@@ -97,21 +91,6 @@ class CuboidShape
 public:
        CuboidShape(const AABB &bounds);
 
-       void Vertices(
-               std::vector<glm::vec3> &vertex,
-               std::vector<glm::vec3> &normal,
-               std::vector<Model::Index> &index,
-               const glm::vec3 &elem_offset = { 0.0f, 0.0f, 0.0f },
-               Model::Index idx_offset = 0
-       ) const override;
-
-       void Outline(
-               std::vector<glm::vec3> &vertex,
-               std::vector<OutlineModel::Index> &index,
-               const glm::vec3 &offset = { 0.0f, 0.0f, 0.0f },
-               OutlineModel::Index idx_offset = 0
-       ) const override;
-
        bool Intersects(const Ray &, const glm::mat4 &, float &, glm::vec3 &) const override;
 
 private:
@@ -126,21 +105,6 @@ class StairShape
 public:
        StairShape(const AABB &bounds, const glm::vec2 &clip);
 
-       void Vertices(
-               std::vector<glm::vec3> &vertex,
-               std::vector<glm::vec3> &normal,
-               std::vector<Model::Index> &index,
-               const glm::vec3 &elem_offset = { 0.0f, 0.0f, 0.0f },
-               Model::Index idx_offset = 0
-       ) const override;
-
-       void Outline(
-               std::vector<glm::vec3> &vertex,
-               std::vector<OutlineModel::Index> &index,
-               const glm::vec3 &offset = { 0.0f, 0.0f, 0.0f },
-               OutlineModel::Index idx_offset = 0
-       ) const override;
-
        bool Intersects(const Ray &, const glm::mat4 &, float &, glm::vec3 &) const override;
 
 private: