Now have a material and highlight map.
This commit is contained in:
parent
19a91bab18
commit
fb2c871419
8 changed files with 159 additions and 110 deletions
|
|
@ -7,9 +7,9 @@
|
|||
|
||||
struct Material {
|
||||
glm::vec3 ambient{0.1f,0.1f,0.1f};
|
||||
glm::vec3 diffuse{0.5f,0.5f,0.5f};
|
||||
glm::vec3 specular{0.8f, 0.8f, 0.8f};
|
||||
float shininess{32.0f};
|
||||
unsigned int diffuseMap = 0;
|
||||
unsigned int specularMap = 0;
|
||||
};
|
||||
|
||||
struct Light {
|
||||
|
|
@ -39,8 +39,6 @@ public:
|
|||
|
||||
void applyMaterial(const Material& material) {
|
||||
setVec3("material.ambient", material.ambient);
|
||||
setVec3("material.diffuse", material.diffuse);
|
||||
setVec3("material.specular", material.specular);
|
||||
setFloat("material.shininess", material.shininess);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue