diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp index b4f268b8b..e9a23f5f7 100644 --- a/src/graphics/irr_driver.cpp +++ b/src/graphics/irr_driver.cpp @@ -1173,7 +1173,6 @@ scene::ISceneNode *IrrDriver::addSkyBox(const std::vector assert(texture.size() == 6); SkyboxTextures = texture; SkyboxCubeMap = 0; - ConvolutedSkyboxCubeMap = 0; return m_scene_manager->addSkyBoxSceneNode(texture[0], texture[1], texture[2], texture[3], texture[4], texture[5]); @@ -1182,10 +1181,9 @@ scene::ISceneNode *IrrDriver::addSkyBox(const std::vector void IrrDriver::suppressSkyBox() { SkyboxTextures.clear(); - glDeleteTextures(1, &SkyboxCubeMap); - glDeleteTextures(1, &ConvolutedSkyboxCubeMap); + if (SkyboxCubeMap) + glDeleteTextures(1, &SkyboxCubeMap); SkyboxCubeMap = 0; - ConvolutedSkyboxCubeMap = 0; } // ---------------------------------------------------------------------------- diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp index 5cd0a4d18..381248cff 100644 --- a/src/graphics/irr_driver.hpp +++ b/src/graphics/irr_driver.hpp @@ -131,7 +131,7 @@ private: RES_CHANGE_CANCEL} m_resolution_changing; public: - GLuint SkyboxCubeMap, ConvolutedSkyboxCubeMap; + GLuint SkyboxCubeMap; /** A simple class to store video resolutions. */ class VideoMode { diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp index e3c1fd636..443e4097b 100644 --- a/src/graphics/render.cpp +++ b/src/graphics/render.cpp @@ -1213,7 +1213,6 @@ void IrrDriver::generateSkyboxCubemap() glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS); glGenTextures(1, &SkyboxCubeMap); - glGenTextures(1, &ConvolutedSkyboxCubeMap); GLint w = 0, h = 0; for (unsigned i = 0; i < 6; i++) @@ -1245,6 +1244,7 @@ void IrrDriver::generateSkyboxCubemap() glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, GL_RGB, w, h, 0, GL_BGRA, GL_UNSIGNED_BYTE, (GLvoid*)rgba[i]); } + /* testSH(rgba, w, h, blueSHCoeff, greenSHCoeff, redSHCoeff); for (unsigned i = 0; i < 6; i++) @@ -1254,7 +1254,7 @@ void IrrDriver::generateSkyboxCubemap() } for (unsigned i = 0; i < 6; i++) delete[] rgba[i]; - glBindTexture(GL_TEXTURE_CUBE_MAP, 0); + glBindTexture(GL_TEXTURE_CUBE_MAP, 0);*/ } @@ -1281,11 +1281,11 @@ void IrrDriver::renderSkybox() transform.getInverse(invtransform); glActiveTexture(GL_TEXTURE0); - glBindTexture(GL_TEXTURE_CUBE_MAP, ConvolutedSkyboxCubeMap); + glBindTexture(GL_TEXTURE_CUBE_MAP, SkyboxCubeMap); glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glUseProgram(MeshShader::SkyboxShader::Program); - MeshShader::SkyboxShader::setUniforms(transform, invtransform, core::vector2df(UserConfigParams::m_width, UserConfigParams::m_height), 0); + MeshShader::SkyboxShader::setUniforms(transform, invtransform, core::vector2df(UserConfigParams::m_width, UserConfigParams::m_height), 0); glDrawElements(GL_TRIANGLES, 6 * 6, GL_UNSIGNED_INT, 0); glBindVertexArray(0); }