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

+ | BVH opti

Browse Source
This commit is contained in:
TheRedShip
2025-01-18 18:08:01 +01:00
parent 85bab977df
commit 4863a5ef77
8 changed files with 1797 additions and 2879 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
shaders/debug.glsl
View File

@ -135,28 +135,24 @@ int traceRay(Ray ray)
hitInfo traceBVH(Ray ray, inout Stats stats)
{
hitInfo hit;
hitInfo hit_bvh;
hit.t = 1e30;
hit.obj_index = -1;
const int MAX_STACK_SIZE = 64;
int stack[MAX_STACK_SIZE];
int stack[64];
int stack_ptr = 0;
stack[0] = 0;
vec3 inv_dir = 1.0 / ray.direction;
while (stack_ptr >= 0)
{
int current_index = stack[stack_ptr--];
GPUBvh node = bvh[current_index];
if (intersectRayBVH(ray, node))
{
stats.box_count++;
stats.box_count++;
if (intersectRayBVH(ray, node, hit_bvh) && hit_bvh.t < hit.t)
{
if (node.is_leaf != 0)
{
for (int i = 0; i < node.primitive_count; i++)
@ -173,13 +169,35 @@ hitInfo traceBVH(Ray ray, inout Stats stats)
stats.triangle_count++;
}
}
if (node.is_leaf == 0 && stack_ptr < MAX_STACK_SIZE - 2)
else
{
stack_ptr++;
stack[stack_ptr] = node.left_index;
stack_ptr++;
stack[stack_ptr] = node.right_index;
// 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;
// stats.box_count += 2;
// intersectRayBVH(ray, left_node, left_hit);
// intersectRayBVH(ray, right_node, right_hit);
// if (left_hit.t > right_hit.t)
// {
// if (left_hit.t < hit.t) stack[++stack_ptr] = node.left_index;
// if (right_hit.t < hit.t) stack[++stack_ptr] = node.right_index;
// }
// else
// {
// if (right_hit.t < hit.t) stack[++stack_ptr] = node.right_index;
// if (left_hit.t < hit.t) stack[++stack_ptr] = node.left_index;
// }
stack[++stack_ptr] = node.left_index;
stack[++stack_ptr] = node.right_index;
}
}
}

8
shaders/intersect.glsl
View File

@ -225,7 +225,7 @@ bool intersect(Ray ray, GPUObject obj, out hitInfo hit)
}
bool intersectRayBVH(Ray ray, GPUBvh node)
bool intersectRayBVH(Ray ray, GPUBvh node, inout hitInfo hit)
{
vec3 invDir = 1.0 / ray.direction;
@ -235,10 +235,10 @@ bool intersectRayBVH(Ray ray, GPUBvh node)
vec3 tMin = min(t1, t2);
vec3 tMax = max(t1, t2);
float tEnter = max(max(tMin.x, tMin.y), tMin.z);
float tExit = min(min(tMax.x, tMax.y), tMax.z);
hit.t = max(max(tMin.x, tMin.y), tMin.z);
hit.last_t = min(min(tMax.x, tMax.y), tMax.z);
return tEnter <= tExit && tExit >= 0.0;
return hit.t <= hit.last_t && hit.last_t >= 0.0;
}

16
shaders/trace.glsl
View File

@ -66,10 +66,8 @@ hitInfo traceBVH(Ray ray)
hit.t = 1e30;
hit.obj_index = -1;
const int MAX_STACK_SIZE = 64;
int stack[MAX_STACK_SIZE];
int stack[64];
int stack_ptr = 0;
stack[0] = 0;
while (stack_ptr >= 0)
@ -78,7 +76,8 @@ hitInfo traceBVH(Ray ray)
GPUBvh node = bvh[current_index];
if (intersectRayBVH(ray, node))
hitInfo temp_hit;
if (intersectRayBVH(ray, node, temp_hit) && temp_hit.t < hit.t)
{
if (node.is_leaf != 0)
{
@ -98,13 +97,10 @@ hitInfo traceBVH(Ray ray)
}
}
}
if (node.is_leaf == 0 && stack_ptr < MAX_STACK_SIZE - 2)
else
{
stack_ptr++;
stack[stack_ptr] = node.left_index;
stack_ptr++;
stack[stack_ptr] = node.right_index;
stack[++stack_ptr] = node.left_index;
stack[++stack_ptr] = node.right_index;
}
}
}