projects
/
opengl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stuff
[opengl.git]
/
material.hpp
diff --git
a/material.hpp
b/material.hpp
index c28bcb452fe6a16f70c072e79ac21bd1f4a5b92e..06cd2d044f6c3b43f97023bf4cff828b3b816bfc 100644
(file)
--- a/
material.hpp
+++ b/
material.hpp
@@
-12,11
+12,11
@@
class Material {
void bind() const;
private:
GLuint progId;
void bind() const;
private:
GLuint progId;
- aiColor
3
D ambient, diffuse, specular;
+ aiColor
4
D ambient, diffuse, specular;
ai_real shininess;
struct Texture {
ai_real shininess;
struct Texture {
- Texture(const std::string &
path
);
+ Texture(const std::string &
file
);
GLuint texId;
};
Texture *diffuseMap = nullptr;
GLuint texId;
};
Texture *diffuseMap = nullptr;