diff --git a/Images/transparent.png b/Images/transparent.png new file mode 100644 index 0000000000000000000000000000000000000000..fc541a991bf4f7454f7451ab34339906d5f4c59b Binary files /dev/null and b/Images/transparent.png differ diff --git a/LearnOpenGL/OpenGLWrapper.h b/LearnOpenGL/OpenGLWrapper.h index bed0e34268606a5f5cf135981a76de5ccbe92f46..eb1a0b627f9f02beb867d77c1db8ddd534379c3b 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 b711dd2257d7d66f1292e00943ad8b41e1c83f86..196e5abdd4b9d168cab182a8e4dce52103b35b65 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);