X-Git-Url: https://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=model.hpp;h=e7ad29cd2c9f97b0cf3b414c9e1c89aaf7d367b6;hp=ecc8842b7e3807d901d642dc721f572a8cd91b78;hb=9886c33eb8cd31f28234585718410cd51aef2a4c;hpb=b472351f3c80cec8c7e9ec30cb4c113c947c0ff7

diff --git a/model.hpp b/model.hpp
index ecc8842..e7ad29c 100644
--- a/model.hpp
+++ b/model.hpp
@@ -32,18 +32,21 @@ class Model {
 		float weights[4] = {1, 0, 0, 0};
 	};
 	
+	public:
+		Model(std::vector<std::string> blendshapes, std::string neutral, Program p);
+		Model(const aiScene *scene, Program p);
+		void draw(Skybox skybox, const float tick) const;
+
 		struct Mesh {
 			Mesh(const aiMesh *aiMesh, GLuint progId);
 			GLuint progId, vao, numIndices;
+			GLuint vbos[6];
 			unsigned int materialIndex;
 			BoneMap boneMap;
 			const aiMesh &ai;
+			void updatePosBuffer() const;
 		};
 
-	public:
-		Model(const aiScene *scene, Program p);
-		void draw(Skybox skybox, const float tick) const;
-
 		class Node {
 			public:
 				Node(aiNode &aiNode, GLuint progId, AnimMap *animMap, std::set<std::string> allBones, Node *parent);
@@ -76,12 +79,17 @@ 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;
 	
 	private:
 		const Program program;
-		
-		std::vector<Mesh> meshes;
 		Node *root;
 
 		std::vector<Material> materials;