mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-17 01:38:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Apply changes to texture reading

Browse Source
This commit is contained in:
Alexander Bock
2014-12-05 21:01:54 +01:00
parent 5b072aa562
commit d3e16a0437
14 changed files with 55 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/rendering/renderablefov.cpp
View File

@@ -25,7 +25,7 @@
#include <openspace/engine/openspaceengine.h>
#include <openspace/util/constants.h>
#include <ghoul/opengl/texturereader.h>
#include <ghoul/io/texture/texturereader.h>
#include <ghoul/opengl/textureunit.h>
#include <ghoul/filesystem/filesystem.h>
@@ -238,7 +238,7 @@ void RenderableFov::loadTexture()
delete _texture;
_texture = nullptr;
if (_colorTexturePath.value() != "") {
_texture = ghoul::opengl::loadTexture(absPath(_colorTexturePath));
_texture = ghoul::io::TextureReader::loadTexture(absPath(_colorTexturePath));
if (_texture) {
LDEBUG("Loaded texture from '" << absPath(_colorTexturePath) << "'");
_texture->uploadTexture();