Rework UI architecture and blendshape animation

[opengl.git] / model.hpp

diff --git a/model.hpp b/model.hpp
index aaf647af3c83c2b89b6e39e0a53bbe28a0c6ed40..e7ad29cd2c9f97b0cf3b414c9e1c89aaf7d367b6 100644 (file)
--- a/model.hpp
+++ b/model.hpp
@@ -79,7 +79,12 @@ class Model {
                Node* find(const aiString name) const;
                Node* find(const std::string &name) const;
 
-               std::pair<glm::vec3, float> closestVertex(Model::Node &node, glm::vec3 a, glm::vec3 b, glm::mat4 parentTrans = glm::mat4(1)) const;
+               struct VertexLookup {
+                       glm::vec3 pos;
+                       int meshIdx, vertIdx;
+                       float distance;
+               };
+               VertexLookup closestVertex(Model::Node &node, glm::vec3 a, glm::vec3 b, glm::mat4 parentTrans = glm::mat4(1)) const;
                
                std::vector<Mesh> meshes;