projects
/
opengl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
6fb9efe
)
Remove unused vars
author
Luke Lau
<luke_lau@icloud.com>
Mon, 10 Feb 2020 02:53:07 +0000
(
02:53
+0000)
committer
Luke Lau
<luke_lau@icloud.com>
Mon, 10 Feb 2020 02:53:07 +0000
(
02:53
+0000)
material.cpp
patch
|
blob
|
history
material.hpp
patch
|
blob
|
history
diff --git
a/material.cpp
b/material.cpp
index 32bf9e0fef2d9b609265955a1c455cc64ef99fef..9ed7e9029401a859dc1428f39e091deecfeefa9b 100644
(file)
--- a/
material.cpp
+++ b/
material.cpp
@@
-35,7
+35,6
@@
Material::Texture::Texture(const aiString fileName, const aiScene &scene) {
glBindTexture(GL_TEXTURE_2D, texId);
std::string path;
- unsigned char *data;
if (fileName.data[0] == '*') {
// embedded
int embIdx = atoi(&fileName.data[1]);
diff --git
a/material.hpp
b/material.hpp
index c814c9eab8451bc23b0a418b8244b69045b71e10..cb3d49eabffbe1f38af2c2dad798f104fd5fcef7 100644
(file)
--- a/
material.hpp
+++ b/
material.hpp
@@
-13,7
+13,6
@@
class Material {
private:
GLuint progId;
aiColor4D ambient, diffuse, specular;
- ai_real shininess, reflectivity, refractiveIndex, opacity;
struct Texture {
Texture(const aiString file, const aiScene &aiScene);