mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-25 21:48:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed texture leaking. (#635)

Browse Source
This commit is contained in:
Jonathas Costa
2018-07-02 13:41:02 -05:00
committed by Alexander Bock
parent a701620c1d
commit b2f680e6da
4 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
+6 -14
View File
@@ -529,6 +529,7 @@ RenderableBillboardsCloud::RenderableBillboardsCloud(const ghoul::Dictionary& di
}
else if (dictionary.hasKey(keyColor)) {
_pointColor = dictionary.value<glm::vec3>(keyColor);
_pointColor.setViewOption(properties::Property::ViewOptions::Color);
addProperty(_pointColor);
}
@@ -709,8 +710,6 @@ void RenderableBillboardsCloud::initializeGL() {
_uniformCache.fadeInValue = _program->uniformLocation("fadeInValue");
_uniformCache.screenSize = _program->uniformLocation("screenSize");
_uniformCache.spriteTexture = _program->uniformLocation("spriteTexture");
_uniformCache.polygonTexture = _program->uniformLocation("polygonTexture");
_uniformCache.hasPolygon = _program->uniformLocation("hasPolygon");
_uniformCache.hasColormap = _program->uniformLocation("hasColorMap");
_uniformCache.enabledRectSizeControl = _program->uniformLocation(
"enabledRectSizeControl"
@@ -833,21 +832,14 @@ void RenderableBillboardsCloud::renderBillboards(const RenderData& data,
glGetIntegerv(GL_VIEWPORT, viewport);
_program->setUniform(_uniformCache.screenSize, glm::vec2(viewport[2], viewport[3]));
ghoul::opengl::TextureUnit spriteTextureUnit;
if (_hasSpriteTexture) {
spriteTextureUnit.activate();
_spriteTexture->bind();
_program->setUniform(_uniformCache.spriteTexture, spriteTextureUnit);
}
ghoul::opengl::TextureUnit polygonTextureUnit;
ghoul::opengl::TextureUnit textureUnit;
textureUnit.activate();
if (_hasPolygon) {
polygonTextureUnit.activate();
glBindTexture(GL_TEXTURE_2D, _pTexture);
_program->setUniform(_uniformCache.polygonTexture, polygonTextureUnit);
_program->setUniform(_uniformCache.hasPolygon, _hasPolygon);
} else {
_spriteTexture->bind();
}
_program->setUniform(_uniformCache.spriteTexture, textureUnit);
_program->setUniform(_uniformCache.hasColormap, _hasColorMapFile);
glBindVertexArray(_vao);