diff options
| author | Omniscient <17525998+omnisci3nce@users.noreply.github.com> | 2024-04-21 12:34:00 +1000 |
|---|---|---|
| committer | Omniscient <17525998+omnisci3nce@users.noreply.github.com> | 2024-04-21 12:34:00 +1000 |
| commit | 1fc69f183bf8f105048b9d47e096ccd402107bbb (patch) | |
| tree | be3060a80d6ace90e911aea234993f847d31cd24 /assets | |
| parent | 6585326fe177a0dc710ef6624a301a36db992e96 (diff) | |
misc cleanup
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/shaders/blinn_phong.frag | 2 | ||||
| -rw-r--r-- | assets/shaders/blinn_phong.vert | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/assets/shaders/blinn_phong.frag b/assets/shaders/blinn_phong.frag index adcc53e..a0ba905 100644 --- a/assets/shaders/blinn_phong.frag +++ b/assets/shaders/blinn_phong.frag @@ -56,7 +56,7 @@ void main() { result += CalcPointLight(pointLights[i], norm, fs_in.FragPos, viewDir); } - // FragColor = vec4(result, 1.0); +// FragColor = vec4(result, 1.0); FragColor = fs_in.Color + 0.5; } diff --git a/assets/shaders/blinn_phong.vert b/assets/shaders/blinn_phong.vert index 6028178..06dc5e7 100644 --- a/assets/shaders/blinn_phong.vert +++ b/assets/shaders/blinn_phong.vert @@ -15,6 +15,7 @@ out VS_OUT { vec3 Normal; vec2 TexCoords; vec4 FragPosLightSpace; + vec4 Color; } vs_out; void main() { @@ -22,5 +23,6 @@ void main() { vs_out.Normal = inNormal; vs_out.TexCoords = inTexCoords; vs_out.FragPosLightSpace = lightSpaceMatrix * vec4(vs_out.FragPos, 1.0); + vs_out.Color = vec4(1.0); gl_Position = projection * view * model * vec4(inPos, 1.0); }
\ No newline at end of file |