projects
/
opengl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
45e43c5
)
Fix stupid typo
author
Luke Lau
<luke_lau@icloud.com>
Thu, 20 Feb 2020 16:58:15 +0000
(16:58 +0000)
committer
Luke Lau
<luke_lau@icloud.com>
Thu, 20 Feb 2020 16:58:15 +0000
(16:58 +0000)
Makefile
patch
|
blob
|
history
material.cpp
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index 97ea9231c689ebadf09bed4cbd9e325b08fdf817..c74b1005f3e0a56f4b5482bbe35fe3971ec7422a 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,6
+1,6
@@
all: bin/main
all: bin/main
-CXX_FLAGS := -g --std=c++17 -march=native -Wall
-DDEBUG_NODES
+CXX_FLAGS := -g --std=c++17 -march=native -Wall
bin/main: model.o material.o image.o skybox.o program.o ik.o main.o util.o
clang++ $(CXX_FLAGS) $^ \
bin/main: model.o material.o image.o skybox.o program.o ik.o main.o util.o
clang++ $(CXX_FLAGS) $^ \
diff --git
a/material.cpp
b/material.cpp
index a1d44beb6d07929865ee5309b6916f4ab109d951..00f98c21f2f87a02b7fba75085fae7c7b34fccd7 100644
(file)
--- a/
material.cpp
+++ b/
material.cpp
@@
-62,7
+62,7
@@
Material::Texture::Texture(const aiString fileName, const aiScene &scene) {
}
void Material::bind() const {
}
void Material::bind() const {
- if (a
mbientOcclusion
!= nullptr) {
+ if (a
lbedo
!= nullptr) {
glUniform1i(glGetUniformLocation(progId, "mat.albedoMap"), 0);
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, albedo->texId);
glUniform1i(glGetUniformLocation(progId, "mat.albedoMap"), 0);
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, albedo->texId);