diff options
| author | omnisci3nce <omniscient.oce@gmail.com> | 2024-04-27 13:08:03 +1000 |
|---|---|---|
| committer | omnisci3nce <omniscient.oce@gmail.com> | 2024-04-27 13:08:03 +1000 |
| commit | 4cbc38b92edaa331fd0f6a077bbe7d7aebdb9ecf (patch) | |
| tree | 753d23b07b09e3494e4cce594bd4b0f4710566f8 /assets/shaders/blinn_phong.frag | |
| parent | d6837defc03e431517f6616ec8e49a8eb3643011 (diff) | |
| parent | c7c33cd18e057bc826a0d31e1860b0ac396a00b6 (diff) | |
Merge remote-tracking branch 'origin/cel-67-load-animation-data-from-gltf' into ral
Diffstat (limited to 'assets/shaders/blinn_phong.frag')
| -rw-r--r-- | assets/shaders/blinn_phong.frag | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/assets/shaders/blinn_phong.frag b/assets/shaders/blinn_phong.frag index 095b19a..a0ba905 100644 --- a/assets/shaders/blinn_phong.frag +++ b/assets/shaders/blinn_phong.frag @@ -33,6 +33,7 @@ in VS_OUT { vec3 Normal; vec2 TexCoords; vec4 FragPosLightSpace; + vec4 Color; } fs_in; // --- Uniforms @@ -55,7 +56,8 @@ 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; } vec3 CalcDirLight(DirLight light, vec3 normal, vec3 viewDir) |