diff options
author | jvech <jmvalenciae@unal.edu.co> | 2022-10-30 19:44:00 -0500 |
---|---|---|
committer | jvech <jmvalenciae@unal.edu.co> | 2022-10-30 19:44:00 -0500 |
commit | 30f2fb748307ea32000089cecaff4d0c4e3d5d73 (patch) | |
tree | 5bfdee9a5e276efea7035a1ec2af72dedf3635e4 /shaders | |
parent | cd327bdfe911c1bf10266469dfaa85bd35420aea (diff) |
feat: mtl file reading added
Bugs to Fix:
- Reading from standard input cause segmentation error
- If the subsequent line to the last f component is a blank line mverse
will throw an error
- mtl path finding needs to be improved
- shaders must be improved
Diffstat (limited to 'shaders')
-rw-r--r-- | shaders/dummy.fsh | 12 | ||||
-rw-r--r-- | shaders/dummy.vsh | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/shaders/dummy.fsh b/shaders/dummy.fsh index 7d94f22..472bb26 100644 --- a/shaders/dummy.fsh +++ b/shaders/dummy.fsh @@ -1,7 +1,17 @@ #version 330 core + +struct Material { + vec3 ambient; + vec3 diffuse; + vec3 specular; + int illum; + float Ns; +}; + +uniform Material mtl; out vec4 FragColor; void main() { - FragColor = vec4(0.0f); + FragColor = vec4(mtl.diffuse, 1.0); } diff --git a/shaders/dummy.vsh b/shaders/dummy.vsh index ab57a50..bd540ab 100644 --- a/shaders/dummy.vsh +++ b/shaders/dummy.vsh @@ -14,7 +14,7 @@ out vec2 TexCoords; void main() { gl_Position = proj * view * model * vec4(aPos, 1.0f); - //FragPos = vec3(model * vec4(aPos, 1.0)); + FragPos = vec3(model * vec4(aPos, 1.0)); //Normal = vec3(rotNormals * vec4(aNormal, 1.0)); //TexCoords = aTexCoords; } |