Dynamitos/Seele
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More rt changes

Browse Source
This commit is contained in:
Dynamitos
2024-07-13 16:22:56 +02:00
parent 3463ecd7b9
commit 42d98d7233
10 changed files with 55 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/shaders/raytracing/ClosestHit.slang
+27 -27
View File
@@ -10,34 +10,34 @@ import RayTracingData;
[shader("closesthit")]
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);
//const float3 barycentricCoords = float3(1.0f - attr.barycentrics.x - attr.barycentrics.y, attr.barycentrics.x, attr.barycentrics.y);
InstanceData inst = pScene.instances[InstanceID()];
MeshData m = pScene.meshData[InstanceID()];
// offset into the index buffer
uint indexOffset = m.firstIndex;
// added to indices to reference correct part of global mesh pool
uint vertexOffset = pScene.meshletInfos[m.meshletOffset].indicesOffset;
uint vertexIndex0 = vertexOffset + pRayTracingParams.indexBuffer[indexOffset + 3 * PrimitiveIndex() + 0];
uint vertexIndex1 = vertexOffset + pRayTracingParams.indexBuffer[indexOffset + 3 * PrimitiveIndex() + 1];
uint vertexIndex2 = vertexOffset + pRayTracingParams.indexBuffer[indexOffset + 3 * PrimitiveIndex() + 2];
VertexAttributes attr0 = pVertexData.getAttributes(vertexIndex0);
VertexAttributes attr1 = pVertexData.getAttributes(vertexIndex1);
VertexAttributes attr2 = pVertexData.getAttributes(vertexIndex2);
FragmentParameter f0 = attr0.getParameter(inst.transformMatrix);
FragmentParameter f1 = attr1.getParameter(inst.transformMatrix);
FragmentParameter f2 = attr2.getParameter(inst.transformMatrix);
FragmentParameter params = FragmentParameter.interpolate(f0, f1, f2, barycentricCoords);
CallablePayload callable;
callable.params = params;
CallShader(InstanceID(), callable);
//InstanceData inst = pScene.instances[InstanceID()];
//MeshData m = pScene.meshData[InstanceID()];
//
//// offset into the index buffer
//uint indexOffset = m.firstIndex;
//// added to indices to reference correct part of global mesh pool
//uint vertexOffset = pScene.meshletInfos[m.meshletOffset].indicesOffset;
//
//uint vertexIndex0 = vertexOffset + pRayTracingParams.indexBuffer[indexOffset + 3 * PrimitiveIndex() + 0];
//uint vertexIndex1 = vertexOffset + pRayTracingParams.indexBuffer[indexOffset + 3 * PrimitiveIndex() + 1];
//uint vertexIndex2 = vertexOffset + pRayTracingParams.indexBuffer[indexOffset + 3 * PrimitiveIndex() + 2];
//
//VertexAttributes attr0 = pVertexData.getAttributes(vertexIndex0);
//VertexAttributes attr1 = pVertexData.getAttributes(vertexIndex1);
//VertexAttributes attr2 = pVertexData.getAttributes(vertexIndex2);
//
//FragmentParameter f0 = attr0.getParameter(inst.transformMatrix);
//FragmentParameter f1 = attr1.getParameter(inst.transformMatrix);
//FragmentParameter f2 = attr2.getParameter(inst.transformMatrix);
//
//FragmentParameter params = FragmentParameter.interpolate(f0, f1, f2, barycentricCoords);
//
//CallablePayload callable;
//callable.params = params;
//
//CallShader(InstanceID(), callable);
hitValue.color = float3(1, 0, 0);
}