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

add relative path for materials in obj files and for OBJ elements in scenes

Browse Source
This commit is contained in:
tomoron
2025-01-21 16:15:07 +01:00
parent 8fbaf4a75c
commit 46ef719f29
16 changed files with 81 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
srcs/class/SceneParser.cpp
View File

@ -6,13 +6,13 @@
/* By: ycontre <ycontre@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/12/26 21:43:51 by TheRed #+# #+# */
/* Updated: 2025/01/16 15:17:10 by tomoron ### ########.fr */
/* Updated: 2025/01/21 15:57:42 by tomoron ### ########.fr */
/* */
/* ************************************************************************** */
#include "SceneParser.hpp"
SceneParser::SceneParser(Scene *scene) : _scene(scene)
SceneParser::SceneParser(Scene *scene, char *filename) : _scene(scene), _filename(filename)
{
object_parsers["sp"] = [](std::stringstream &ss) -> Object * { return (new Sphere(ss)); };
object_parsers["pl"] = [](std::stringstream &ss) -> Object * { return (new Plane(ss)); };
@ -115,7 +115,7 @@ void SceneParser::parseObj(std::stringstream &line)
glm::mat4 transform = glm::eulerAngleXYZ(glm::radians(xtransform), glm::radians(ytransform), glm::radians(ztransform));
ObjParser obj(name);
ObjParser obj(name, _filename);
obj.parse(*_scene, glm::vec3(x, y, z), (1.0 / scale), transform);
}