This commit is contained in:
Dynamitos
2023-11-13 13:48:01 +01:00
parent 9a26fd75ca
commit 59d6c9d794
3 changed files with 14 additions and 5 deletions
+12 -3
View File
@@ -14,12 +14,21 @@ struct Scene
layout(set=2) layout(set=2)
ParameterBlock<Scene> pScene; ParameterBlock<Scene> pScene;
struct VertexShaderOutput
{
FragmentParameter parameter : PARAMETER;
float4 clipPos: SV_Position;
}
[shader("vertex")] [shader("vertex")]
FragmentParameter vertexMain( VertexShaderOutput vertexMain(
uint vertexId: SV_VertexID, uint vertexId: SV_VertexID,
uint instanceId: SV_InstanceID, uint instanceId: SV_InstanceID,
) : PARAMETER{ ){
InstanceData inst = pScene.instances[instanceId]; InstanceData inst = pScene.instances[instanceId];
VertexAttributes attr = pVertexData.getAttributes(vertexId, inst.transformMatrix); VertexAttributes attr = pVertexData.getAttributes(vertexId, inst.transformMatrix);
return attr.getParameter(inst.transformMatrix); VertexShaderOutput output;
output.parameter = attr.getParameter(inst.transformMatrix);
output.clipPos = output.parameter.position_CS;
return output;
} }
+1 -1
View File
@@ -29,7 +29,7 @@ struct BlinnPhong : IBRDF
float3 h = normalize(lightDir_TS + viewDir_TS); float3 h = normalize(lightDir_TS + viewDir_TS);
float nDotH = saturate(dot(normal, h)); float nDotH = saturate(dot(normal, h));
return baseColor; return baseColor * (nDotL + nDotH) * lightColor;
} }
}; };
+1 -1
View File
@@ -12,7 +12,7 @@ Camera::Camera()
, bNeedsViewBuild(false) , bNeedsViewBuild(false)
{ {
yaw = 0; yaw = 0;
pitch = 0; pitch = 0.2;
} }
Camera::~Camera() Camera::~Camera()