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

set metallic at 1 by default on mtl materials

Browse Source
This commit is contained in:
tomoron
2025-01-15 19:13:13 +01:00
parent 2097a71090
commit 7d81da012e
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
srcs/class/SceneParser.cpp
View File

@ -6,7 +6,7 @@
/* By: ycontre <ycontre@student.42.fr> +#+ +:+ +#+ */ /* By: ycontre <ycontre@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/12/26 21:43:51 by TheRed #+# #+# */ /* Created: 2024/12/26 21:43:51 by TheRed #+# #+# */
/* Updated: 2025/01/15 13:27:43 by tomoron ### ########.fr */ /* Updated: 2025/01/15 19:08:42 by tomoron ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -132,7 +132,6 @@ void SceneParser::parseMtl(std::stringstream &input_line, std::map<std::string,
std::string matName; std::string matName;
std::string identifier; std::string identifier;
std::string line; std::string line;
float tmp;
Material *mat; Material *mat;
input_line >> filename; input_line >> filename;
@ -158,11 +157,12 @@ void SceneParser::parseMtl(std::stringstream &input_line, std::map<std::string,
throw std::runtime_error("OBJ: syntax error in material file, missing material name"); throw std::runtime_error("OBJ: syntax error in material file, missing material name");
mat = new Material; mat = new Material;
bzero(mat, sizeof(Material)); bzero(mat, sizeof(Material));
mat->metallic = 1.0f;
continue; continue;
} }
if(!mat) if(!mat)
throw std::runtime_error("OBJ: error in material file, material name not defined"); throw std::runtime_error("OBJ: error in material file, material name not defined");
if(/*identifier == "Ka" || */identifier == "Kd") if(identifier == "Kd")
{ {
if(!(lineStream >> mat->color.x >> mat->color.y >> mat->color.z)) if(!(lineStream >> mat->color.x >> mat->color.y >> mat->color.z))
throw std::runtime_error("OBJ: syntax error while getting material color"); throw std::runtime_error("OBJ: syntax error while getting material color");
@ -175,16 +175,10 @@ void SceneParser::parseMtl(std::stringstream &input_line, std::map<std::string,
} }
else if(identifier == "Ke") else if(identifier == "Ke")
{ {
if(!(lineStream >> tmp)) float x, y, z;
if(!(lineStream >> x >> y >> z))
throw std::runtime_error("OBJ: syntax error while getting material emission"); throw std::runtime_error("OBJ: syntax error while getting material emission");
mat->emission += tmp; mat->emission = (x + y + z) / 3;
if(!(lineStream >> tmp))
throw std::runtime_error("OBJ: syntax error while getting material emission");
mat->emission += tmp;
if(!(lineStream >> tmp))
throw std::runtime_error("OBJ: syntax error while getting material emission");
mat->emission += tmp;
mat->emission /= 3;
} }
else if(identifier == "Ni") else if(identifier == "Ni")
{ {