add parsing of faces with "/" in obj files

This commit is contained in:
2025-01-18 19:10:58 +01:00
parent 4863a5ef77
commit d62b5a5de0
4 changed files with 53 additions and 25 deletions

View File

@ -6,7 +6,7 @@
/* By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/16 15:00:49 by tomoron #+# #+# */
/* Updated: 2025/01/17 17:19:51 by tomoron ### ########.fr */
/* Updated: 2025/01/18 18:32:42 by tomoron ### ########.fr */
/* */
/* ************************************************************************** */
@ -23,14 +23,16 @@ class ObjParser
void parse(Scene &scene);
private:
glm::vec3 getVertex(std::stringstream &line);
glm::vec2 getUV(std::stringstream &line);
void addFace(std::stringstream &line, Scene &scene);
long int checkVertexIndex(int index, size_t size);
void parseMtl(std::stringstream &line, Scene &scene);
bool addTriangleFromPolygon(std::vector<glm::vec3> &vertices, Scene &scene, int inv);
void addTriangle(glm::vec3 v1, glm::vec3 v2, glm::vec3 v3, Scene &scene);
int pointInTriangle(glm::vec3 pts[3], std::vector<glm::vec3> vertices, size_t cur);
glm::vec3 getVertex(std::stringstream &line);
glm::vec2 getUV(std::stringstream &line);
void addFace(std::stringstream &line, Scene &scene);
long int checkVertexIndex(int index, size_t size);
void parseMtl(std::stringstream &line, Scene &scene);
bool addTriangleFromPolygon(std::vector<glm::vec3> &vertices, Scene &scene, int inv);
void addTriangle(glm::vec3 v1, glm::vec3 v2, glm::vec3 v3, Scene &scene);
int pointInTriangle(glm::vec3 pts[3], std::vector<glm::vec3> vertices, size_t cur);
std::vector<std::string> objSplit(std::string str, std::string delim);
void getFaceVertices(std::vector<glm::vec3> &faceVertices, std::stringstream &line);
std::ifstream _file;
std::vector<glm::vec3> _vertices;