Idk
This commit is contained in:
@@ -14,12 +14,21 @@ struct Scene
|
||||
layout(set=2)
|
||||
ParameterBlock<Scene> pScene;
|
||||
|
||||
struct VertexShaderOutput
|
||||
{
|
||||
FragmentParameter parameter : PARAMETER;
|
||||
float4 clipPos: SV_Position;
|
||||
}
|
||||
|
||||
[shader("vertex")]
|
||||
FragmentParameter vertexMain(
|
||||
VertexShaderOutput vertexMain(
|
||||
uint vertexId: SV_VertexID,
|
||||
uint instanceId: SV_InstanceID,
|
||||
) : PARAMETER{
|
||||
){
|
||||
InstanceData inst = pScene.instances[instanceId];
|
||||
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;
|
||||
}
|
||||
@@ -29,7 +29,7 @@ struct BlinnPhong : IBRDF
|
||||
float3 h = normalize(lightDir_TS + viewDir_TS);
|
||||
float nDotH = saturate(dot(normal, h));
|
||||
|
||||
return baseColor;
|
||||
return baseColor * (nDotL + nDotH) * lightColor;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ Camera::Camera()
|
||||
, bNeedsViewBuild(false)
|
||||
{
|
||||
yaw = 0;
|
||||
pitch = 0;
|
||||
pitch = 0.2;
|
||||
}
|
||||
|
||||
Camera::~Camera()
|
||||
|
||||
Reference in New Issue
Block a user