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

add and remove iswaCygnets through lua scripts

Browse Source
This commit is contained in:
Michael Nilsson
2016-04-11 14:26:53 -04:00
parent 9419ed9dfc
commit d5d79e01b3
6 changed files with 49 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/iswa/rendering/textureplane.cpp
+5 -3
View File
@@ -47,7 +47,10 @@ TexturePlane::TexturePlane(const ghoul::Dictionary& dictionary)
,_futureTexture(nullptr)
{
_id = id();
setName("TexturePlane" + std::to_string(_id));
std::string name;
dictionary.getValue("Name", name);
setName(name);
//setName("TexturePlane" + std::to_string(_id));
registerProperties();
}
@@ -132,7 +135,6 @@ void TexturePlane::update(const UpdateData& data){
_lastUpdateTime = _time;
}
}
if(_futureTexture && _futureTexture->isFinished){
loadTexture();
_futureTexture = nullptr;
@@ -148,7 +150,6 @@ void TexturePlane::loadTexture() {
std::unique_ptr<ghoul::opengl::Texture> texture = ghoul::io::TextureReader::ref().loadTextureFromMemory(_memorybuffer);
if (texture) {
// LDEBUG("Loaded texture from '" << absPath(_data->path) << "'");
texture->uploadTexture();
// Textures of planets looks much smoother with AnisotropicMipMap rather than linear
texture->setFilter(ghoul::opengl::Texture::FilterMode::Linear);
@@ -163,6 +164,7 @@ void TexturePlane::updateTexture(){
// std::shared_ptr<DownloadManager::FileFuture> future = ISWAManager::ref().downloadImage(_data->id, absPath(_data->path));
if(future){
_futureTexture = future;
}
}