More ray tracing changes

res/shaders/raytracing/ClosestHit.slang

@@ -4,12 +4,11 @@ import MaterialParameter;
 import LightEnv;
 import Scene;
 import RayTracingData;
-import MATERIAL_FILE_NAME;
 
 // simplification: all BLAS only have 1 geometry
 
 [shader("closesthit")]
-void closesthit(inout float3 hitValue, in BuiltInTriangleIntersectionAttributes attr)
+void closestHit(inout RayPayload hitValue, in BuiltInTriangleIntersectionAttributes attr)
 {
     const float3 barycentricCoords = float3(1.0f - attr.barycentrics.x - attr.barycentrics.y, attr.barycentrics.x, attr.barycentrics.y);
 
@@ -35,23 +34,10 @@ void closesthit(inout float3 hitValue, in BuiltInTriangleIntersectionAttributes
 
     FragmentParameter params = FragmentParameter.interpolate(f0, f1, f2, barycentricCoords);
 
-    LightingParameter lightingParams = params.getLightingParameter();
-    MaterialParameter materialParams = params.getMaterialParameter();
-	let brdf = Material.prepare(materialParams);
-    
-    float3 result = float3(0, 0, 0);
-    for(int i = 0; i < pLightEnv.numDirectionalLights; ++i)
-    {
-        result += pLightEnv.directionalLights[i].illuminate(lightingParams, brdf);
-    }
-    for(uint i = 0; i < pLightEnv.numPointLights; ++i)
-    {
-        result += pLightEnv.pointLights[i].illuminate(lightingParams, brdf);
-    }
-    result += brdf.evaluateAmbient();
-    // gamma correction
-    result = result / (result + float3(1.0));
-    result = pow(result, float3(1.0/2.2));
+    CallablePayload callable;
+    callable.params = params;
 
-    hitValue = result;
+    CallShader(0, callable);
+
+    hitValue.color = float3(0, 1, 1) + callable.color;
 }