brammie15/GP1-DirectX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Exam Done

Browse Source
This commit is contained in:
Bram Verhulst
2025-01-13 17:12:23 +01:00
parent 5e28e5fff4
commit 0d556f12b4
29 changed files with 837 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
project/resources/Fire.fx
View File

@@ -1,5 +1,6 @@
float4x4 gWorldViewProj : WorldViewProjection;
float4x4 gWorldMatrix : WorldMatrix;
SamplerState gSampleState : SampleState;
texture2D gDiffuseMap : DiffuseMap;
@@ -79,7 +80,7 @@ VS_OUTPUT VS(VS_INPUT input){
}
float4 PS(VS_OUTPUT input) : SV_TARGET{
return gDiffuseMap.Sample(samPoint, input.TexCoord);
return gDiffuseMap.Sample(gSampleState, input.TexCoord);
}

2
project/resources/PosCol3D.fx
View File

@@ -104,7 +104,7 @@ float3 Shade(VS_OUTPUT input)
// Compute Phong specular lighting
float ks = (specularSample.x + specularSample.y + specularSample.z) / 3.f;
float3 specular = Phong(ks, glossSample * gShininess, invLightDirection, invViewDirection, normal);
float3 specular = Phong(ks, glossSample * gShininess, gLightDirection, invViewDirection, normal);
// Compute observed area based on the cosine of the light angle
float cosAngle = dot(invLightDirection, normal);