From f427dba87c475e4160fc97d98daccedb4a467550 Mon Sep 17 00:00:00 2001
From: Woohyung Choi <201421062@sce212.ajou.ac.kr>
Date: Tue, 10 Dec 2019 03:03:48 +0900
Subject: [PATCH] Add transparent image. Remove unused ambientMap.
---
Images/transparent.png | Bin 0 -> 120 bytes
LearnOpenGL/OpenGLWrapper.h | 1 -
LearnOpenGL/Source.cpp | 11 ++++++++---
3 files changed, 8 insertions(+), 4 deletions(-)
create mode 100644 Images/transparent.png
diff --git a/Images/transparent.png b/Images/transparent.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc541a991bf4f7454f7451ab34339906d5f4c59b
GIT binary patch
literal 120
zcmeAS@N?(olHy`uVBq!ia0y~yU|<Ac4mJh`26@pVoghwekh>GZx^prw85kH?(j9#r
z85lP9bN@+XWnf_7EbxddW?<ku1j3A>8eR=xqg)(AB*K$_{Qv*Io`Lf>^IukH*Ha7(
O3=E#GelF{r5}E*_;~gCU
literal 0
HcmV?d00001
diff --git a/LearnOpenGL/OpenGLWrapper.h b/LearnOpenGL/OpenGLWrapper.h
index bed0e34..eb1a0b6 100644
--- a/LearnOpenGL/OpenGLWrapper.h
+++ b/LearnOpenGL/OpenGLWrapper.h
@@ -34,7 +34,6 @@ private:
GLuint diffuseMap;
GLuint specularMap;
- GLuint ambientMap;
public:
Material(GLuint _prog, GLuint _diffuseMap, GLuint _specularMap);
diff --git a/LearnOpenGL/Source.cpp b/LearnOpenGL/Source.cpp
index b711dd2..196e5ab 100644
--- a/LearnOpenGL/Source.cpp
+++ b/LearnOpenGL/Source.cpp
@@ -64,8 +64,13 @@ int main()
auto magenta = load_image("magenta.png");
auto orange = load_image("orange.png");
auto white = load_image("white.png");
+ auto transparent = load_image("transparent.png");
- auto defaultMaterial = new Material(lightmap, orange, white);
+ auto container_diffuse = load_image("container2.png");
+ auto container_specular = load_image("container2_specular.png");
+
+ auto defaultMaterial = new Material(lightmap, orange, transparent);
+ auto planeMaterial = new Material(texture_shader, container_diffuse, transparent);
auto teapot = make_render_object(make_mesh("teapot.obj"));
{
@@ -101,7 +106,7 @@ int main()
plane->set_scale(glm::vec3(10, 10, 1));
}
{
- plane->set_material(defaultMaterial);
+ plane->set_material(planeMaterial);
}
auto cube3 = make_render_object(cube);
@@ -130,7 +135,7 @@ int main()
cube1->render(camera);
cube2->render(camera);
cube3->render(camera);
- plane->render(camera);
+ //plane->render(camera);
}
glfwSwapBuffers(window);
--
GitLab