tom/RT_GPU
1
0
Fork 0
mirror of https://github.com/TheRedShip/RT_GPU.git synced 2025-09-27 10:48:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

cleanup ObjParser

Browse Source
This commit is contained in:
tomoron
2025-01-17 19:33:42 +01:00
parent ce49ecb219
commit bb673d4af1
2 changed files with 44 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
includes/RT/ObjParser.hpp
View File

@ -6,7 +6,7 @@
/* By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/16 15:00:49 by tomoron #+# #+# */ /* Created: 2025/01/16 15:00:49 by tomoron #+# #+# */
/* Updated: 2025/01/17 14:53:58 by tomoron ### ########.fr */ /* Updated: 2025/01/17 17:19:51 by tomoron ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -24,15 +24,19 @@ class ObjParser
private: private:
glm::vec3 getVertex(std::stringstream &line); glm::vec3 getVertex(std::stringstream &line);
void addFace(std::stringstream &line, std::vector<glm::vec3> &vertices, int mat, Scene &scene); glm::vec2 getUV(std::stringstream &line);
void addFace(std::stringstream &line, Scene &scene);
long int checkVertexIndex(int index, size_t size); long int checkVertexIndex(int index, size_t size);
void parseMtl(std::stringstream &line, std::map<std::string, int> &materials, Scene &scene); void parseMtl(std::stringstream &line, Scene &scene);
bool addTriangleFromPolygon(std::vector<glm::vec3> &vertices, Scene &scene, int mat, int inv); bool addTriangleFromPolygon(std::vector<glm::vec3> &vertices, Scene &scene, int inv);
void addTriangle(glm::vec3 v1, glm::vec3 v2, glm::vec3 v3, int mat, Scene &scene); 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); int pointInTriangle(glm::vec3 pts[3], std::vector<glm::vec3> vertices, size_t cur);
std::ifstream _file; std::ifstream _file;
std::vector<glm::vec3> vertex; std::vector<glm::vec3> _vertices;
std::vector<glm::vec2> _textureVertices;
int _mat;
std::map<std::string, int> _matNames;
}; };
#endif #endif

81
srcs/class/ObjParser.cpp
View File

@ -6,7 +6,7 @@
/* By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/16 15:00:33 by tomoron #+# #+# */ /* Created: 2025/01/16 15:00:33 by tomoron #+# #+# */
/* Updated: 2025/01/17 14:54:36 by tomoron ### ########.fr */ /* Updated: 2025/01/17 19:31:52 by tomoron ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -14,6 +14,7 @@
ObjParser::ObjParser(std::string &filename) ObjParser::ObjParser(std::string &filename)
{ {
_mat = 0;
_file.open(filename); _file.open(filename);
if(!_file.is_open()) if(!_file.is_open())
throw std::runtime_error("OBJ : could not open object file"); throw std::runtime_error("OBJ : could not open object file");
@ -33,6 +34,15 @@ glm::vec3 ObjParser::getVertex(std::stringstream &line)
return(res); return(res);
} }
glm::vec2 ObjParser::getUV(std::stringstream &line)
{
glm::vec2 res;
if(!(line >> res.x) || (!(line >> res.y) && !line.eof()))
throw std::runtime_error("syntax error in obj file while parsing texture vertex");
return(res);
}
long int ObjParser::checkVertexIndex(int index, size_t size) long int ObjParser::checkVertexIndex(int index, size_t size)
{ {
if((size_t)index > size || index == 0 || (index < 0 && (size_t)(-index) > size)) if((size_t)index > size || index == 0 || (index < 0 && (size_t)(-index) > size))
@ -72,15 +82,13 @@ int ObjParser::pointInTriangle(glm::vec3 pts[3], std::vector<glm::vec3> vertices
return(0); return(0);
} }
bool ObjParser::addTriangleFromPolygon(std::vector<glm::vec3> &vertices, Scene &scene, int mat, int inv) bool ObjParser::addTriangleFromPolygon(std::vector<glm::vec3> &vertices, Scene &scene, int inv)
{ {
glm::vec3 v1, v2 ,v3; glm::vec3 v1, v2 ,v3;
float dot; float dot;
(void)scene;
for (size_t i = 0; i < vertices.size(); i++) for (size_t i = 0; i < vertices.size(); i++)
{ {
std::cout << (char)('A' + i) << std::endl;
if(!i) if(!i)
v1 = vertices.back(); v1 = vertices.back();
else else
@ -91,66 +99,47 @@ bool ObjParser::addTriangleFromPolygon(std::vector<glm::vec3> &vertices, Scene &
std::cout << glm::to_string(v1) << std::endl; std::cout << glm::to_string(v1) << std::endl;
std::cout << glm::to_string(v2) << std::endl; std::cout << glm::to_string(v2) << std::endl;
std::cout << glm::to_string(v3) << std::endl; std::cout << glm::to_string(v3) << std::endl;
// not gud dot = glm::dot(v2 - v1, v2 - v3) / (glm::length(v2 - v1) * glm::length(v2 - v3));
// with the one above dot = std::acos(dot) * (180.0/3.141592653589793238463); // if dot > 180
if (inv) if (inv)
dot = glm::cross(v2 - v1, v2 - v3).z; //maybe gud dot = glm::cross(v2 - v1, v2 - v3).z;
else else
dot = glm::cross(v2 - v3, v2 - v1).z; //maybe gud dot = glm::cross(v2 - v3, v2 - v1).z;
// almost works dot = glm::dot(glm::normalize(v1 - v2), glm::normalize(v3 - v2));
std::cout << "dot : " << dot << std::endl;
if(dot <= 0) if(dot <= 0)
{
std::cout << "concave" << std::endl;
continue; continue;
}
// std::cout << "convex" << std::endl;
// std::cout << std::endl;
// continue;
if(pointInTriangle((glm::vec3 [3]){v1, v2, v3}, vertices, i)) if(pointInTriangle((glm::vec3 [3]){v1, v2, v3}, vertices, i))
{
std::cout << "vert in triangle" << std::endl;
continue; continue;
}
vertices.erase(vertices.begin() + i); vertices.erase(vertices.begin() + i);
addTriangle(v1, v2 ,v3 ,mat, scene); addTriangle(v1, v2 ,v3 , scene);
return(1); return(1);
} }
return(0); return(0);
std::cout << "____________________" << std::endl;
} }
void ObjParser::addFace(std::stringstream &line, std::vector<glm::vec3> &vertices, int mat, Scene &scene) void ObjParser::addFace(std::stringstream &line, Scene &scene)
{ {
int vert_index; int vert_index;
std::vector<glm::vec3> face_vertices; std::vector<glm::vec3> face_vertices;
std::string el;
(void)mat;
(void)scene;
while((line >> vert_index)) while((line >> vert_index))
face_vertices.push_back(vertices[checkVertexIndex(vert_index, vertices.size())]); face_vertices.push_back(_vertices[checkVertexIndex(vert_index, _vertices.size())]);
if(face_vertices.size() < 3) if(face_vertices.size() < 3)
throw std::runtime_error("OBJ : face does not have enough vertices"); throw std::runtime_error("OBJ : face does not have enough vertices");
// for(size_t i = 0; i < face_vertices.size(); i++)
// std::cout << face_vertices[i].x << " " << face_vertices[i].y << " " << face_vertices[i].z << " | ";
// std::cout << std::endl;
while(face_vertices.size() > 3) while(face_vertices.size() > 3)
if (!addTriangleFromPolygon(face_vertices, scene, mat, 0)) if (!addTriangleFromPolygon(face_vertices, scene, 0))
addTriangleFromPolygon(face_vertices, scene, mat, 1); addTriangleFromPolygon(face_vertices, scene, 1);
if(!line.eof()) if(!line.eof())
throw std::runtime_error("OBJ: an error occured while parsing face"); throw std::runtime_error("OBJ: an error occured while parsing face");
addTriangle(face_vertices[0], face_vertices[1], face_vertices[2],mat, scene); addTriangle(face_vertices[0], face_vertices[1], face_vertices[2], scene);
} }
void ObjParser::addTriangle(glm::vec3 v1, glm::vec3 v2, glm::vec3 v3, int mat, Scene &scene) void ObjParser::addTriangle(glm::vec3 v1, glm::vec3 v2, glm::vec3 v3, Scene &scene)
{ {
scene.addObject(new Triangle(v1, v2, v3, mat)); scene.addObject(new Triangle(v1, v2, v3, _mat));
} }
void ObjParser::parseMtl(std::stringstream &input_line, std::map<std::string, int> &materials, Scene &scene) void ObjParser::parseMtl(std::stringstream &input_line, Scene &scene)
{ {
std::string filename; std::string filename;
std::ifstream file; std::ifstream file;
@ -175,7 +164,7 @@ void ObjParser::parseMtl(std::stringstream &input_line, std::map<std::string, in
if(mat) if(mat)
{ {
scene.addMaterial(mat); scene.addMaterial(mat);
materials[matName] = scene.getMaterialData().size() - 1; _matNames[matName] = scene.getMaterialData().size() - 1;
} }
lineStream >> matName; lineStream >> matName;
if(matName.empty()) if(matName.empty())
@ -216,22 +205,16 @@ void ObjParser::parseMtl(std::stringstream &input_line, std::map<std::string, in
if(mat) if(mat)
{ {
scene.addMaterial(mat); scene.addMaterial(mat);
materials[matName] = scene.getMaterialData().size() - 1; _matNames[matName] = scene.getMaterialData().size() - 1;
} }
file.close(); file.close();
} }
void ObjParser::parse(Scene &scene) void ObjParser::parse(Scene &scene)
{ {
std::vector<glm::vec3> vertices;
std::string filename;
std::map<std::string, int> matNames;
std::string line; std::string line;
std::string identifier; std::string identifier;
std::ifstream file;
int curMat;
curMat = 0;
while (getline(_file, line)) while (getline(_file, line))
{ {
try{ try{
@ -241,17 +224,19 @@ void ObjParser::parse(Scene &scene)
identifier = ""; identifier = "";
lineStream >> identifier; lineStream >> identifier;
if(identifier == "v") if(identifier == "v")
vertices.push_back(getVertex(lineStream)); _vertices.push_back(getVertex(lineStream));
else if (identifier == "vt")
_textureVertices.push_back(getUV(lineStream));
else if (identifier == "f") else if (identifier == "f")
addFace(lineStream, vertices, curMat, scene); addFace(lineStream, scene);
else if (identifier == "mtllib") else if (identifier == "mtllib")
parseMtl(lineStream, matNames, scene); parseMtl(lineStream, scene);
else if (identifier == "usemtl") else if (identifier == "usemtl")
{ {
lineStream >> identifier; lineStream >> identifier;
if(matNames.find(identifier) == matNames.end()) if(_matNames.find(identifier) == _matNames.end())
throw std::runtime_error("OBJ: invalid material name"); throw std::runtime_error("OBJ: invalid material name");
curMat = matNames[identifier]; _mat = _matNames[identifier];
} }
} catch (std::exception &e) } catch (std::exception &e)
{ {