mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 04:58:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Convert projected images instead of swizzling for RenderablePlanetProjection

Browse Source
This commit is contained in:
Alexander Bock
2016-05-19 17:17:18 +02:00
parent f9358d4e45
commit 50d8b93d30
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/newhorizons/rendering/renderableplanetprojection.cpp
+2 -3
View File
@@ -645,11 +645,10 @@ void RenderablePlanetProjection::update(const UpdateData& data) {
void RenderablePlanetProjection::loadProjectionTexture() {
_textureProj = nullptr;
if (_colorTexturePath.value() != "") {
if (_projectionTexturePath.value() != "") {
_textureProj = ghoul::io::TextureReader::ref().loadTexture(absPath(_projectionTexturePath));
if (_textureProj) {
if (_textureProj->format() == ghoul::opengl::Texture::Format::Red)
_textureProj->setSwizzleMask({ GL_RED, GL_RED, GL_RED, GL_ONE });
ghoul::opengl::convertTextureFormat(ghoul::opengl::Texture::Format::RGB, *_textureProj);
_textureProj->uploadTexture();
// TODO: AnisotropicMipMap crashes on ATI cards ---abock
//_textureProj->setFilter(ghoul::opengl::Texture::FilterMode::AnisotropicMipMap);