@@ -17,15 +17,13 @@ Sphere spheres[SPHERE_COUNT] = {
17
17
};
18
18
#define TRIANGLE_COUNT 1
19
19
Triangle triangles[TRIANGLE_COUNT] = {
20
- // Triangle_Triangle(mat3(vec3(-1.8,0.35,0.3),vec3(-1.2,0.35,0.0),vec3(-1.5,0.8,-0.3)),INVALID_ID_16BIT,0u)
21
- Triangle_Triangle(mat3 (vec3 (- 4 ,0.7 ,- 4 ),vec3 (0.0 ,0.7 ,0.0 ),vec3 (- 4.0 ,0.8 ,4.0 )),INVALID_ID_16BIT,0u)
20
+ Triangle_Triangle(mat3 (vec3 (- 1.8 ,0.35 ,0.3 ),vec3 (- 1.2 ,0.35 ,0.0 ),vec3 (- 1.5 ,0.8 ,- 0.3 )),INVALID_ID_16BIT,0u)
22
21
};
23
22
24
23
25
24
#define LIGHT_COUNT 1
26
25
Light lights[LIGHT_COUNT] = {
27
- // {vec3(30.0,25.0,15.0),0u}
28
- {vec3 (30.0 ,25.0 ,15.0 )* 0.01 ,0u}
26
+ {vec3 (30.0 ,25.0 ,15.0 ),0u}
29
27
};
30
28
31
29
@@ -285,13 +283,13 @@ float irr_glsl_sampling_probProjectedSphericalTriangleSample(in mat3 sphericalVe
285
283
286
284
// the interaction here is the interaction at the illuminator-end of the ray, not the receiver
287
285
vec3 irr_glsl_light_deferred_eval_and_prob(
288
- out float pdf, in Light light, in vec3 L,
286
+ out float pdf, in Light light, in vec3 L
289
287
#if TRIANGLE_METHOD== 0
290
- in float intersectionT,
288
+ , in float intersectionT
291
289
#else
292
- in vec3 origin,
290
+ , in vec3 origin
293
291
#if TRIANGLE_METHOD== 2
294
- in vec3 normalAtOrigin, in bool wasBSDFAtOrigin
292
+ , in vec3 normalAtOrigin, in bool wasBSDFAtOrigin
295
293
#endif
296
294
#endif
297
295
)
@@ -404,13 +402,13 @@ void closestHitProgram(in ImmutableRay_t _immutable, inout irr_glsl_xoroshiro64s
404
402
{
405
403
float lightPdf;
406
404
vec3 lightVal = irr_glsl_light_deferred_eval_and_prob(
407
- lightPdf,lights[lightID],_immutable.direction,
405
+ lightPdf,lights[lightID],_immutable.direction
408
406
#if TRIANGLE_METHOD== 0
409
- mutable.intersectionT,
407
+ , mutable.intersectionT
410
408
#else
411
- _immutable.origin,
409
+ , _immutable.origin
412
410
#if TRIANGLE_METHOD== 2
413
- _immutable.normalAtOrigin,_immutable.wasBSDFAtOrigin
411
+ , _immutable.normalAtOrigin,_immutable.wasBSDFAtOrigin
414
412
#endif
415
413
#endif
416
414
);
0 commit comments