Merge branch 'dev' into alpha

larc · Dec 4, 2023 · 89f1c68 · 89f1c68
2 parents bd34a99 + 4d3c20d
commit 89f1c68
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/include/gproshan/raytracing/utils.h b/include/gproshan/raytracing/utils.h
@@ -154,17 +154,14 @@ struct t_eval_hit
 	{
 		switch(illum)
 		{
-			case 1:
-			case 2:
-				return scatter_diffuse(v, scattered, rnd);
 			case 3:
 			case 5:
 			case 6:
 			case 7:
 				return scatter_reflect(v, scattered, rnd);
 		}
 
-		return false;
+		return scatter_diffuse(v, scattered, rnd);
 	}
 
 	__host_device__

diff --git a/src/gproshan/raytracing/optix.cu b/src/gproshan/raytracing/optix.cu
@@ -41,7 +41,7 @@ extern "C" __global__ void __closesthit__radiance()
 	const CHE & mesh = **(const CHE **) optixGetSbtDataPointer();
 
 	const int primID = optixGetPrimitiveIndex();
-	float2 bar = optixGetTriangleBarycentrics();
+	const float2 bar = optixGetTriangleBarycentrics();
 
 	OptixTraversableHandle gas = optixGetGASTraversableHandle();
 	const index_t sbtID = optixGetSbtGASIndex();