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

* | Merge from texture

Browse Source
This commit is contained in:
TheRedShip
2025-01-30 15:50:00 +01:00
parent 2e062a69e9
commit c5ebf2b6ff
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scenes/test.rt
View File

@ -3,5 +3,5 @@ CAM 15.6252 30.089 20.0977 -46.6002 -103.601 0 1 90 5
MAT 50 50 50 0. 0. 0. // 0 gray MAT 50 50 50 0. 0. 0. // 0 gray
pl 0 0 0 0 1 0 0 // floor pl 0 0 0 0 1 0 0 // floor
# OBJ obj/jinx.obj 0 1.5 0 OBJ obj/jinx.obj 0 1.5 0
OBJ obj/sponza.obj 0 5 0 0.01 # OBJ obj/sponza.obj 0 5 0 0.01

2
shaders/light.glsl
View File

@ -121,7 +121,7 @@ vec3 getTextureColor(int texture_index, hitInfo hit)
void calculateLightColor(GPUMaterial mat, hitInfo hit, inout vec3 color, inout vec3 light, inout uint rng_state) void calculateLightColor(GPUMaterial mat, hitInfo hit, inout vec3 color, inout vec3 light, inout uint rng_state)
{ {
// color *= mat.texture_index == -1 ? vec3(1.0) : getTextureColor(mat.texture_index, hit); color *= mat.texture_index == -1 ? vec3(1.0) : getTextureColor(mat.texture_index, hit);
color *= mat.color; color *= mat.color;
light += mat.emission * mat.color; light += mat.emission * mat.color;
// light += sampleLights(hit.position, rng_state); // light += sampleLights(hit.position, rng_state);