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

Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA

Browse Source
This commit is contained in:
Sebastian Piwell
2016-04-01 11:24:32 -04:00
parent d3fc17fc4d 00c16cf21b
commit f7643769d9
6 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/iswa/rendering/textureplane.cpp
+3 -5
View File
@@ -52,6 +52,7 @@ TexturePlane::TexturePlane()
_fileExtension = ISWAManager::ref().fileExtension(_cygnetId.value());
_path = "${OPENSPACE_DATA}/"+ name()+_fileExtension;
_cygnetId.onChange([this](){
_fileExtension = ISWAManager::ref().fileExtension(_cygnetId.value());
_path = "${OPENSPACE_DATA}/"+ name()+_fileExtension;
@@ -70,11 +71,8 @@ bool TexturePlane::initialize(){
CygnetPlane::initialize();
std::thread t = std::thread(std::bind(&TexturePlane::updateTexture, this));
t.detach();
loadTexture();
updateTexture();
return isReady();
}