projects
/
opengl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a .clang-format
[opengl.git]
/
material.hpp
diff --git
a/material.hpp
b/material.hpp
index 074e8ae8117478afb454ec38a114e451ffa6506a..cb3d49eabffbe1f38af2c2dad798f104fd5fcef7 100644
(file)
--- a/
material.hpp
+++ b/
material.hpp
@@
-8,19
+8,19
@@
class Material {
public:
class Material {
public:
- Material(const aiMaterial &aiMaterial, GLuint progId);
+ Material(const aiMaterial &aiMaterial,
const aiScene &aiScene,
GLuint progId);
void bind() const;
private:
GLuint progId;
aiColor4D ambient, diffuse, specular;
void bind() const;
private:
GLuint progId;
aiColor4D ambient, diffuse, specular;
- ai_real shininess, reflectivity, refractiveIndex, opacity;
struct Texture {
struct Texture {
- Texture(const
std::string &fil
e);
+ Texture(const
aiString file, const aiScene &aiScen
e);
GLuint texId;
};
GLuint texId;
};
- Texture *diffuseMap = nullptr;
- Texture *specularMap = nullptr;
- Texture *normalMap = nullptr;
+ Texture *albedo = nullptr;
+ Texture *normal = nullptr;
+ Texture *metallicRoughness = nullptr;
+ Texture *ambientOcclusion = nullptr;
};
};