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

~ | chepa

Browse Source
This commit is contained in:
RedShip
2025-02-03 20:25:19 +01:00
committed by tomoron
parent 7ffc43b7cb
commit b425f1e7b8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shaders/trace.glsl
View File

@ -171,7 +171,7 @@ hitInfo traceRay(Ray ray)
hitInfo hitScene; hitInfo hitScene;
hitInfo hit; hitInfo hit;
#if 1 #if 0
for (int i = 0; i < 10; i++) // portal ray for (int i = 0; i < 10; i++) // portal ray
{ {
hitBVH = traverseBVHs(ray); hitBVH = traverseBVHs(ray);

4
srcs/class/ObjParser.cpp
View File

@ -6,7 +6,7 @@
/* By: ycontre <ycontre@student.42.fr> +#+ +:+ +#+ */ /* By: ycontre <ycontre@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/16 15:00:33 by tomoron #+# #+# */ /* Created: 2025/01/16 15:00:33 by tomoron #+# #+# */
/* Updated: 2025/02/03 18:40:04 by ycontre ### ########.fr */ /* Updated: 2025/02/03 19:01:06 by ycontre ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -257,7 +257,7 @@ void ObjParser::parseMtl(std::stringstream &input_line, Scene &scene)
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 == "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))