From 837fe1cd39cd021da1cb5689ee14ce2a961df161 Mon Sep 17 00:00:00 2001 From: anselme Date: Sun, 15 Nov 2015 12:14:42 +0100 Subject: [PATCH] added destroyGL deleting modules in renderer --- phongmaterial.cpp | 6 ++++++ phongmaterial.h | 5 +++-- sparrowrenderer.cpp | 4 +++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/phongmaterial.cpp b/phongmaterial.cpp index f62b728..4c86993 100644 --- a/phongmaterial.cpp +++ b/phongmaterial.cpp @@ -49,3 +49,9 @@ void PhongMaterial::setTexture(Texture* myTexture) diffuse_texture = myTexture; updateShader(); } + +void PhongMaterial::setNormalMap(Texture* myNormalMap) +{ + normal_map = myNormalMap; + updateShader(); +} diff --git a/phongmaterial.h b/phongmaterial.h index e08d99f..2b76a65 100644 --- a/phongmaterial.h +++ b/phongmaterial.h @@ -13,8 +13,8 @@ public: glm::vec3 diffuse; glm::vec3 specular; float shininess; - Texture* diffuse_texture; - Texture* normal_map; + Texture* diffuse_texture; + Texture* normal_map; PhongMaterial() : emission(0), @@ -40,6 +40,7 @@ public: void crappyBindAttributes(); void setTexture(Texture* myTexture); + void setNormalMap(Texture* myNormalMap); void updateShader(); }; diff --git a/sparrowrenderer.cpp b/sparrowrenderer.cpp index 323a86c..6a32225 100644 --- a/sparrowrenderer.cpp +++ b/sparrowrenderer.cpp @@ -44,7 +44,9 @@ void SparrowRenderer::initGL(int width, int height, bool forceCrappy) void SparrowRenderer::destroyGL() { - + for(ModuleNode &m : modules) + delete m.module; + modules.clear(); } void SparrowRenderer::resizeGL(int width, int height)