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

+ | Light array sent to gpu

Browse Source
This commit is contained in:
TheRedShip
2025-01-16 17:17:03 +01:00
parent 787833ac84
commit 02e670195c
9 changed files with 69 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shaders/compute.glsl
View File

@ -61,6 +61,12 @@ layout(std430, binding = 2) buffer MaterialBuffer
GPUMaterial materials[];
};
layout(std430, binding = 3) buffer LightsBuffer
{
int lightsIndex[];
};
layout(std140, binding = 0) uniform CameraData
{
GPUCamera camera;
@ -71,7 +77,9 @@ layout(std140, binding = 1) uniform VolumeData
GPUVolume volume;
};
uniform int u_objectsNum;
uniform int u_lightsNum;
uniform vec2 u_resolution;
uniform int u_pixelisation;
uniform int u_frameCount;

11
shaders/light.glsl
View File

@ -71,9 +71,10 @@ vec3 sampleLights(vec3 position, inout uint rng_state)
{
vec3 light = vec3(0.0);
for (int i = 0; i < u_objectsNum; i++)
for (int i = 0; i < u_lightsNum; i++)
{
GPUObject obj = objects[i];
int light_index = lightsIndex[i];
GPUObject obj = objects[light_index];
GPUMaterial mat = materials[obj.mat_index];
if (mat.emission > 0.0)
{
@ -83,7 +84,7 @@ vec3 sampleLights(vec3 position, inout uint rng_state)
Ray shadow_ray = Ray(position + light_dir * 0.01, light_dir);
hitInfo shadow_hit = traceRay(shadow_ray);
if (shadow_hit.obj_index == i)
if (shadow_hit.obj_index == light_index)
light += mat.emission * mat.color / (light_dist);
}
}
@ -116,6 +117,6 @@ vec3 sampleLights(vec3 position, inout uint rng_state)
void calculateLightColor(GPUMaterial mat, hitInfo hit, inout vec3 color, inout vec3 light, inout uint rng_state)
{
color *= mat.color;
light += mat.emission * mat.color;
// light += sampleLights(hit.position, rng_state);
// light += mat.emission * mat.color;
light += sampleLights(hit.position, rng_state);
}