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

remove thread and called update texture in textureplane constructor

Browse Source
This commit is contained in:
Michael Nilsson
2016-04-01 09:08:54 -04:00
parent df1f79bc62
commit a583856a52
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/iswa/rendering/textureplane.cpp
+2 -3
View File
@@ -52,6 +52,8 @@ TexturePlane::TexturePlane()
_fileExtension = ISWAManager::ref().fileExtension(_cygnetId.value());
_path = "${OPENSPACE_DATA}/"+ name()+_fileExtension;
updateTexture();
_cygnetId.onChange([this](){
_fileExtension = ISWAManager::ref().fileExtension(_cygnetId.value());
_path = "${OPENSPACE_DATA}/"+ name()+_fileExtension;
@@ -69,9 +71,6 @@ bool TexturePlane::initialize(){
_pscOffset = glm::vec4(0, 0, 0, 1);
CygnetPlane::initialize();
std::thread t = std::thread(std::bind(&TexturePlane::updateTexture, this));
t.detach();
loadTexture();