projects
/
opengl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add extra skyboxes
[opengl.git]
/
material.hpp
diff --git
a/material.hpp
b/material.hpp
index 06cd2d044f6c3b43f97023bf4cff828b3b816bfc..7735f630206b1abf9c5f7a4ecfb03abee5eec154 100644
(file)
--- a/
material.hpp
+++ b/
material.hpp
@@
-13,14
+13,15
@@
class Material {
private:
GLuint progId;
aiColor4D ambient, diffuse, specular;
private:
GLuint progId;
aiColor4D ambient, diffuse, specular;
- ai_real shininess;
+ ai_real shininess
, reflectivity, refractiveIndex, opacity
;
struct Texture {
Texture(const std::string &file);
GLuint texId;
};
struct Texture {
Texture(const std::string &file);
GLuint texId;
};
- Texture *diffuseMap = nullptr;
- Texture *specularMap = nullptr;
- Texture *normalMap = nullptr;
+ Texture *albedo = nullptr;
+ Texture *normal = nullptr;
+ Texture *metallicRoughness = nullptr;
+ Texture *ambientOcclusion = nullptr;
};
};