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

request file extension

Browse Source
This commit is contained in:
Michael Nilsson
2016-04-01 16:32:18 -04:00
parent 00c16cf21b
commit f4964b1628
8 changed files with 139 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/iswa/rendering/textureplane.cpp
+23 -14
View File
@@ -49,14 +49,15 @@ TexturePlane::TexturePlane()
setName("TexturePlane" + std::to_string(_id));
registerProperties();
_fileExtension = ISWAManager::ref().fileExtension(_cygnetId.value());
_path = "${OPENSPACE_DATA}/"+ name()+_fileExtension;
_fileExtension = "";
_path = "";
_cygnetId.onChange([this](){
_fileExtension = ISWAManager::ref().fileExtension(_cygnetId.value());
_path = "${OPENSPACE_DATA}/"+ name()+_fileExtension;
updateTexture(); });
std::remove(absPath(_path).c_str());
_fileExtension = "";
_path = "";
ISWAManager::ref().fileExtension(_cygnetId.value(), &_fileExtension);
});
}
@@ -71,7 +72,7 @@ bool TexturePlane::initialize(){
CygnetPlane::initialize();
updateTexture();
ISWAManager::ref().fileExtension(_cygnetId.value(), &_fileExtension);
return isReady();
}
@@ -143,14 +144,22 @@ void TexturePlane::render(){
}
void TexturePlane::update(){
CygnetPlane::update();
if(_path != ""){
CygnetPlane::update();
if(_futureTexture && _futureTexture->isFinished){
_path = absPath("${OPENSPACE_DATA}/"+_futureTexture->filePath);
loadTexture();
if(_futureTexture && _futureTexture->isFinished){
_path = absPath("${OPENSPACE_DATA}/"+_futureTexture->filePath);
loadTexture();
delete _futureTexture;
_futureTexture = nullptr;
delete _futureTexture;
_futureTexture = nullptr;
}
} else {
if(_fileExtension == ""){
//send new request
} else{
_path = "${OPENSPACE_DATA}/"+ name()+_fileExtension;
updateTexture();
}
}
}