mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-07 04:49:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Changed function names

Browse Source
This commit is contained in:
Sebastian Piwell
2016-04-06 09:39:54 -04:00
parent bea3a1b89b
commit fdaeaa7361
8 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/iswa/rendering/iswacontainer.cpp
View File

@@ -121,7 +121,7 @@ void ISWAContainer::addISWACygnet(std::shared_ptr<ISWACygnet> cygnet){
}
}
void ISWAContainer::deleteCygnet(std::string name){
void ISWAContainer::deleteISWACygnet(std::string name){
std::shared_ptr<ISWACygnet> c = iSWACygnet(name);
auto it = std::find(

3
modules/iswa/rendering/iswacontainer.h
View File

@@ -48,8 +48,7 @@ public:
void addISWACygnet(int id, std::string data);
void addISWACygnet(std::shared_ptr<ISWACygnet> cygnet);
void deleteCygnet(ISWACygnet* cygnet);
void deleteCygnet(std::string name);
void deleteISWACygnet(std::string name);
std::shared_ptr<ISWACygnet> iSWACygnet(std::string name);

2
modules/iswa/rendering/iswacygnet.cpp
View File

@@ -42,7 +42,7 @@ ISWACygnet::ISWACygnet(std::shared_ptr<Metadata> data)
addProperty(_updateInterval);
addProperty(_delete);
_delete.onChange([this](){ISWAManager::ref().deleteCygnet(name());});
_delete.onChange([this](){ISWAManager::ref().deleteISWACygnet(name());});
}
ISWACygnet::~ISWACygnet(){}

4
modules/iswa/rendering/screenspacecygnet.cpp
View File

@@ -133,7 +133,7 @@ void ScreenSpaceCygnet::render(){
void ScreenSpaceCygnet::update(){
_time = Time::ref().currentTime();
float openSpaceUpdateInterval = abs(Time::ref().deltaTime()*_updateInterval);
if(openSpaceUpdateInterval){
if(abs(_time-_lastUpdateTime) >= openSpaceUpdateInterval){
@@ -143,9 +143,7 @@ void ScreenSpaceCygnet::update(){
}
if(_futureTexture && _futureTexture->isFinished){
loadTexture();
_futureTexture = nullptr;
}

1
modules/iswa/rendering/screenspacecygnet.h
View File

@@ -56,7 +56,6 @@ private:
float _lastUpdateTime = 0.0f;
std::shared_ptr<DownloadManager::FileFuture> _futureTexture;
std::string _fileExtension;
int _id;
};

6
modules/iswa/util/iswamanager.cpp
View File

@@ -94,7 +94,7 @@ namespace openspace{
}
}
void ISWAManager::addCygnet(std::string info){
void ISWAManager::addISWACygnet(std::string info){
std::string token;
std::stringstream ss(info);
getline(ss,token,',');
@@ -109,8 +109,8 @@ namespace openspace{
_container->addISWACygnet("${OPENSPACE_DATA}/"+data);
}
void ISWAManager::deleteCygnet(std::string name){
_container->deleteCygnet(name);
void ISWAManager::deleteISWACygnet(std::string name){
_container->deleteISWACygnet(name);
}
std::shared_ptr<DownloadManager::FileFuture> ISWAManager::downloadImage(int id, std::string path){

4
modules/iswa/util/iswamanager.h
View File

@@ -61,8 +61,8 @@ public:
~ISWAManager();
std::shared_ptr<ISWACygnet> createISWACygnet(std::shared_ptr<Metadata> metadata);
void addCygnet(std::string info);
void deleteCygnet(std::string);
void addISWACygnet(std::string info);
void deleteISWACygnet(std::string);
std::shared_ptr<DownloadManager::FileFuture> downloadImage(int, std::string);
void downloadData();

2
modules/onscreengui/src/gui.cpp
View File

@@ -434,7 +434,7 @@ void GUI::renderMainWindow() {
ImGui::InputText("addCynget", addCygnetBuffer, addCygnetBufferSize);
if(ImGui::SmallButton("Add Cygnet")){
ISWAManager::ref().addCygnet(std::string(addCygnetBuffer));
ISWAManager::ref().addISWACygnet(std::string(addCygnetBuffer));
}
}
#endif