model -> mesh

[blank.git] / src / model / composite.cpp

diff --git a/src/model/composite.cpp b/src/model/composite.cpp
index ffb58572eae4bafaceea5f14978a8ec36e7b9089..850777078b72d8b8b113025c8bdb2d6d9162b255 100644 (file)
--- a/src/model/composite.cpp
+++ b/src/model/composite.cpp
@@ -2,9 +2,9 @@
 #include "CompositeInstance.hpp"
 #include "Skeletons.hpp"
 
-#include "EntityModel.hpp"
 #include "shapes.hpp"
 #include "../graphics/DirectionalLighting.hpp"
+#include "../graphics/EntityMesh.hpp"
 
 #include <glm/gtx/quaternion.hpp>
 
@@ -12,7 +12,10 @@
 namespace blank {
 
 CompositeModel::CompositeModel()
-: node_model(nullptr)
+: parent(nullptr)
+, node_mesh(nullptr)
+, id(0)
+, bounds{{ 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }}
 , position(0.0f)
 , orientation(1.0f, 0.0f, 0.0f, 0.0f)
 , parts() {
@@ -92,9 +95,9 @@ glm::mat4 CompositeInstance::GlobalTransform() const noexcept {
 
 void CompositeInstance::Render(const glm::mat4 &M, DirectionalLighting &prog) const {
        glm::mat4 transform(M * LocalTransform());
-       if (part_model->HasNodeModel()) {
+       if (part_model->HasNodeMesh()) {
                prog.SetM(transform);
-               part_model->NodeModel().Draw();
+               part_model->NodeMesh().Draw();
        }
        for (const CompositeInstance &part : parts) {
                part.Render(transform, prog);
@@ -104,7 +107,7 @@ void CompositeInstance::Render(const glm::mat4 &M, DirectionalLighting &prog) co
 
 Skeletons::Skeletons()
 : skeletons()
-, models() {
+, meshes() {
 
 }
 
@@ -114,50 +117,87 @@ Skeletons::~Skeletons() {
 
 void Skeletons::LoadHeadless() {
        skeletons.clear();
-       skeletons.reserve(3);
+       skeletons.reserve(4);
        {
-               AABB bounds{{ -0.25f, -0.5f, -0.25f }, { 0.25f, 0.5f, 0.25f }};
+               AABB bounds{{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }};
                skeletons.emplace_back(new CompositeModel);
+               skeletons[0]->ID(1);
                skeletons[0]->Bounds(bounds);
        }
        {
                AABB bounds{{ -0.5f, -0.25f, -0.5f }, { 0.5f, 0.25f, 0.5f }};
                skeletons.emplace_back(new CompositeModel);
+               skeletons[1]->ID(2);
                skeletons[1]->Bounds(bounds);
        }
        {
-               AABB bounds{{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }};
+               AABB bounds{{ -0.25f, -0.5f, -0.25f }, { 0.25f, 0.5f, 0.25f }};
                skeletons.emplace_back(new CompositeModel);
+               skeletons[2]->ID(3);
                skeletons[2]->Bounds(bounds);
        }
+       {
+               AABB bounds{{ -0.25f, -0.5f, -0.35f }, { 0.25f, 0.5f, 0.35f }};
+               skeletons.emplace_back(new CompositeModel);
+               skeletons[3]->ID(4);
+               skeletons[3]->Bounds(bounds);
+       }
 }
 
 void Skeletons::Load() {
        LoadHeadless();
-       models.resize(3);
-       EntityModel::Buffer buf;
+       meshes.resize(4);
+       EntityMesh::Buffer buf;
        {
                CuboidShape shape(skeletons[0]->Bounds());
-               shape.Vertices(buf, 1.0f);
-               buf.colors.resize(shape.VertexCount(), { 1.0f, 1.0f, 0.0f });
-               models[0].Update(buf);
-               skeletons[0]->SetNodeModel(&models[0]);
+               shape.Vertices(buf, 3.0f);
+               buf.hsl_mods.resize(shape.VertexCount(), { 0.0f, 1.0f, 1.0f });
+               buf.rgb_mods.resize(shape.VertexCount(), { 1.0f, 1.0f, 0.0f });
+               meshes[0].Update(buf);
+               skeletons[0]->SetNodeMesh(&meshes[0]);
        }
        {
                CuboidShape shape(skeletons[1]->Bounds());
                buf.Clear();
-               shape.Vertices(buf, 2.0f);
-               buf.colors.resize(shape.VertexCount(), { 0.0f, 1.0f, 1.0f });
-               models[1].Update(buf);
-               skeletons[1]->SetNodeModel(&models[1]);
+               shape.Vertices(buf, 0.0f);
+               buf.hsl_mods.resize(shape.VertexCount(), { 0.0f, 1.0f, 1.0f });
+               buf.rgb_mods.resize(shape.VertexCount(), { 0.0f, 1.0f, 1.0f });
+               meshes[1].Update(buf);
+               skeletons[1]->SetNodeMesh(&meshes[1]);
        }
        {
                StairShape shape(skeletons[2]->Bounds(), { 0.4f, 0.4f });
                buf.Clear();
-               shape.Vertices(buf, 3.0f);
-               buf.colors.resize(shape.VertexCount(), { 1.0f, 0.0f, 1.0f });
-               models[2].Update(buf);
-               skeletons[2]->SetNodeModel(&models[2]);
+               shape.Vertices(buf, 1.0f);
+               buf.hsl_mods.resize(shape.VertexCount(), { 0.0f, 1.0f, 1.0f });
+               buf.rgb_mods.resize(shape.VertexCount(), { 1.0f, 0.0f, 1.0f });
+               meshes[2].Update(buf);
+               skeletons[2]->SetNodeMesh(&meshes[2]);
+       }
+       {
+               CuboidShape shape(skeletons[3]->Bounds());
+               buf.Clear();
+               shape.Vertices(buf, 2.0f);
+               buf.hsl_mods.resize(shape.VertexCount(), { 0.0f, 1.0f, 1.0f });
+               buf.rgb_mods.resize(shape.VertexCount(), { 1.0f, 0.25f, 0.5f });
+               meshes[3].Update(buf);
+               skeletons[3]->SetNodeMesh(&meshes[3]);
+       }
+}
+
+CompositeModel *Skeletons::ByID(std::uint16_t id) noexcept {
+       if (id == 0 || id > skeletons.size()) {
+               return nullptr;
+       } else {
+               return skeletons[id - 1].get();
+       }
+}
+
+const CompositeModel *Skeletons::ByID(std::uint16_t id) const noexcept {
+       if (id == 0 || id > skeletons.size()) {
+               return nullptr;
+       } else {
+               return skeletons[id - 1].get();
        }
 }