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

+ | Opti bvh on compute.glsl

Browse Source
This commit is contained in:
RedShip
2025-01-18 21:12:11 +01:00
parent 146381f191
commit 388ad5fc7d
6 changed files with 59 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scenes/test.rt
View File

@ -22,4 +22,4 @@ pl 0 -10 0 0 1 0 2 // floor
qu -20 59 -20 40 0 0 0 0 40 6
OBJ obj/Model.obj
OBJ obj/audi.obj

67
shaders/trace.glsl
View File

@ -77,32 +77,49 @@ hitInfo traceBVH(Ray ray)
GPUBvh node = bvh[current_index];
hitInfo temp_hit;
if (intersectRayBVH(ray, node, temp_hit) && temp_hit.t < hit.t)
{
if (node.is_leaf != 0)
{
for (int i = 0; i < node.primitive_count; i++)
{
GPUTriangle obj = triangles[node.first_primitive + i];
if (node.is_leaf != 0)
{
for (int i = 0; i < node.primitive_count; i++)
{
GPUTriangle obj = triangles[node.first_primitive + i];
hitInfo temp_hit;
if (intersectTriangle(ray, obj, temp_hit) && temp_hit.t > 0.0f && temp_hit.t < hit.t + 0.0001)
{
hit.t = temp_hit.t;
hit.last_t = temp_hit.last_t;
hit.obj_index = node.first_primitive + i;
hit.mat_index = obj.mat_index;
hit.position = temp_hit.position;
hit.normal = temp_hit.normal;
}
}
}
else
{
stack[++stack_ptr] = node.left_index;
stack[++stack_ptr] = node.right_index;
}
}
hitInfo temp_hit;
if (intersectTriangle(ray, obj, temp_hit) && temp_hit.t > 0.0f && temp_hit.t < hit.t + 0.0001)
{
hit.t = temp_hit.t;
hit.last_t = temp_hit.last_t;
hit.obj_index = node.first_primitive + i;
hit.mat_index = obj.mat_index;
hit.position = temp_hit.position;
hit.normal = temp_hit.normal;
}
}
}
else
{
GPUBvh left_node = bvh[node.left_index];
GPUBvh right_node = bvh[node.right_index];
hitInfo left_hit;
hitInfo right_hit;
left_hit.t = 1e30;
right_hit.t = 1e30;
bool left_bool = intersectRayBVH(ray, left_node, left_hit);
bool right_bool = intersectRayBVH(ray, right_node, right_hit);
if (left_hit.t > right_hit.t)
{
if (left_hit.t < hit.t && left_bool) stack[++stack_ptr] = node.left_index;
if (right_hit.t < hit.t && right_bool) stack[++stack_ptr] = node.right_index;
}
else
{
if (right_hit.t < hit.t && right_bool) stack[++stack_ptr] = node.right_index;
if (left_hit.t < hit.t && left_bool) stack[++stack_ptr] = node.left_index;
}
}
}
return (hit);

6
srcs/RT.cpp
View File

@ -6,7 +6,7 @@
/* By: ycontre <ycontre@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/09/27 14:51:49 by TheRed #+# #+# */
/* Updated: 2025/01/18 19:28:58 by ycontre ### ########.fr */
/* Updated: 2025/01/18 21:10:23 by ycontre ### ########.fr */
/* */
/* ************************************************************************** */
@ -20,8 +20,8 @@ int main(int argc, char **argv)
return (1);
Window window(&scene, WIDTH, HEIGHT, "RT_GPU", 0);
Shader shader("shaders/vertex.vert", "shaders/frag.frag", "shaders/compute.glsl");
// Shader shader("shaders/vertex.vert", "shaders/frag.frag", "shaders/debug.glsl");
// Shader shader("shaders/vertex.vert", "shaders/frag.frag", "shaders/compute.glsl");
Shader shader("shaders/vertex.vert", "shaders/frag.frag", "shaders/debug.glsl");
GLint max_gpu_size;
glGetIntegerv(GL_MAX_SHADER_STORAGE_BLOCK_SIZE, &max_gpu_size);

3
srcs/class/BVH.cpp
View File

@ -6,7 +6,7 @@
/* By: ycontre <ycontre@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/16 21:48:48 by TheRed #+# #+# */
/* Updated: 2025/01/18 19:16:45 by ycontre ### ########.fr */
/* Updated: 2025/01/18 21:11:35 by ycontre ### ########.fr */
/* */
/* ************************************************************************** */
@ -165,7 +165,6 @@ std::vector<GPUBvh> BVH::getGPUBvhs()
int currentIndex = 0;
flatten(bvhs, currentIndex);
std::cout << "BVH Done: " << bvhs.size() << std::endl;
return (bvhs);
}

7
srcs/class/ObjParser.cpp
View File

@ -3,10 +3,10 @@
/* ::: :::::::: */
/* ObjParser.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ */
/* By: ycontre <ycontre@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/16 15:00:33 by tomoron #+# #+# */
/* Updated: 2025/01/18 18:57:31 by tomoron ### ########.fr */
/* Updated: 2025/01/18 21:07:12 by ycontre ### ########.fr */
/* */
/* ************************************************************************** */
@ -154,7 +154,8 @@ void ObjParser::addFace(std::stringstream &line, Scene &scene)
while(faceVertices.size() > 3)
if (!addTriangleFromPolygon(faceVertices, scene, 0))
addTriangleFromPolygon(faceVertices, scene, 1);
if(!addTriangleFromPolygon(faceVertices, scene, 1))
return ;
if(!line.eof())
throw std::runtime_error("OBJ: an error occured while parsing face");

8
srcs/class/Scene.cpp
View File

@ -6,7 +6,7 @@
/* By: ycontre <ycontre@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/12/23 18:29:41 by ycontre #+# #+# */
/* Updated: 2025/01/17 19:05:53 by ycontre ### ########.fr */
/* Updated: 2025/01/18 21:04:56 by ycontre ### ########.fr */
/* */
/* ************************************************************************** */
@ -58,9 +58,15 @@ bool Scene::parseScene(char *name)
}
file.close();
std::cout << "Parsing done" << std::endl;
std::cout << "Starting BVH" << std::endl;
BVH *bvh = new BVH(_gpu_triangles, 0, _gpu_triangles.size());
_gpu_bvh = bvh->getGPUBvhs();
std::cout << "BVH Done: " << bvh->size() << std::endl;
return (true);
}