From 7eae57b02f16e447f2cd7f3962f17b1cef890b34 Mon Sep 17 00:00:00 2001 From: Sebastian Piwell Date: Tue, 3 May 2016 13:46:02 -0400 Subject: [PATCH 1/3] Removed iswacontainer --- data/scene/iswa/iswa.mod | 8 +-- modules/iswa/CMakeLists.txt | 2 - modules/iswa/iswamodule.cpp | 2 - modules/iswa/rendering/iswacontainer.cpp | 75 ------------------------ modules/iswa/rendering/iswacontainer.h | 50 ---------------- modules/iswa/util/iswamanager.cpp | 1 - src/query/query.cpp | 1 - 7 files changed, 1 insertion(+), 138 deletions(-) delete mode 100644 modules/iswa/rendering/iswacontainer.cpp delete mode 100644 modules/iswa/rendering/iswacontainer.h diff --git a/data/scene/iswa/iswa.mod b/data/scene/iswa/iswa.mod index dd372ee0aa..ae16c9242b 100644 --- a/data/scene/iswa/iswa.mod +++ b/data/scene/iswa/iswa.mod @@ -1,13 +1,7 @@ return { { Name = "iSWA", - Parent = "SolarSystem", - Renderable = { - Type = "ISWAContainer", - TextureCygnets = "[]", - DataCygnets = "[-2]", - Frame = "GALACTIC" - }, + Parent = "Root", Ephemeris = { Type = "Spice", Body = "Sun", diff --git a/modules/iswa/CMakeLists.txt b/modules/iswa/CMakeLists.txt index 064d47aa59..cb0db8dd8f 100644 --- a/modules/iswa/CMakeLists.txt +++ b/modules/iswa/CMakeLists.txt @@ -25,7 +25,6 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) set(HEADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswacontainer.h ${CMAKE_CURRENT_SOURCE_DIR}/rendering/cygnetplane.h ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswacygnet.h ${CMAKE_CURRENT_SOURCE_DIR}/rendering/dataplane.h @@ -39,7 +38,6 @@ set(HEADER_FILES source_group("Header Files" FILES ${HEADER_FILES}) set(SOURCE_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswacontainer.cpp ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswacygnet.cpp ${CMAKE_CURRENT_SOURCE_DIR}/rendering/cygnetplane.cpp ${CMAKE_CURRENT_SOURCE_DIR}/rendering/dataplane.cpp diff --git a/modules/iswa/iswamodule.cpp b/modules/iswa/iswamodule.cpp index 861c58be89..b7e4a17a26 100644 --- a/modules/iswa/iswamodule.cpp +++ b/modules/iswa/iswamodule.cpp @@ -29,7 +29,6 @@ #include -#include #include #include #include @@ -44,7 +43,6 @@ namespace openspace { auto fRenderable = FactoryManager::ref().factory(); ghoul_assert(fRenderable, "No renderable factory existed"); - fRenderable->registerClass("ISWAContainer"); fRenderable->registerClass("TexturePlane"); fRenderable->registerClass("DataPlane"); fRenderable->registerClass("KameleonPlane"); diff --git a/modules/iswa/rendering/iswacontainer.cpp b/modules/iswa/rendering/iswacontainer.cpp deleted file mode 100644 index b5bf1ea6a8..0000000000 --- a/modules/iswa/rendering/iswacontainer.cpp +++ /dev/null @@ -1,75 +0,0 @@ -/***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2015 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -namespace { - using json = nlohmann::json; - const std::string _loggerCat = "ISWAContainer"; -} - -namespace openspace{ - -ISWAContainer::ISWAContainer(const ghoul::Dictionary& dictionary) - :Renderable(dictionary) -{ - // std::string textureCygnets; - // std::string dataCygnets; - // dictionary.getValue("TextureCygnets", textureCygnets); - // dictionary.getValue("DataCygnets", dataCygnets); - // std::cout << textureCygnets << std::endl; - // std::cout << dataCygnets << std::endl; - - // if(textureCygnets != ""){ - // json j = json::parse(textureCygnets); - // for (auto& id : j) { - // ISWAManager::ref().addISWACygnet(id, "TEXTURE"); - // } - // } - - // if(dataCygnets != ""){ - // json j = json::parse(dataCygnets); - // for (auto& id : j) { - // ISWAManager::ref().addISWACygnet(id, "DATA"); - // } - // } -} - -ISWAContainer::~ISWAContainer(){} -bool ISWAContainer::initialize(){return true;} -bool ISWAContainer::deinitialize(){return true;} -bool ISWAContainer::isReady() const { return true; } -void ISWAContainer::render(const RenderData& data){} - -void ISWAContainer::update(const UpdateData& data){} - -} \ No newline at end of file diff --git a/modules/iswa/rendering/iswacontainer.h b/modules/iswa/rendering/iswacontainer.h deleted file mode 100644 index b99c9bc378..0000000000 --- a/modules/iswa/rendering/iswacontainer.h +++ /dev/null @@ -1,50 +0,0 @@ -/***************************************************************************************** -* * -* OpenSpace * -* * -* Copyright (c) 2014-2015 * -* * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this * -* software and associated documentation files (the "Software"), to deal in the Software * -* without restriction, including without limitation the rights to use, copy, modify, * -* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to the following * -* conditions: * -* * -* The above copyright notice and this permission notice shall be included in all copies * -* or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * -* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * -* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * -* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * -* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -****************************************************************************************/ - -#ifndef __ISWACONTAINER_H__ -#define __ISWACONTAINER_H__ -#include - - -namespace openspace{ -struct ExtensionFuture; - -class ISWAContainer : public Renderable{ -public: - ISWAContainer(const ghoul::Dictionary& dictionary); - ~ISWAContainer(); - - bool initialize() override; - bool deinitialize() override; - - bool isReady() const override; - - virtual void render(const RenderData& data) override; - virtual void update(const UpdateData& data) override; - -private: -}; - -}//namespace openspace -#endif \ No newline at end of file diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp index b59d2e066b..7910401e7d 100644 --- a/modules/iswa/util/iswamanager.cpp +++ b/modules/iswa/util/iswamanager.cpp @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/src/query/query.cpp b/src/query/query.cpp index af63050b09..bc5191c2f4 100644 --- a/src/query/query.cpp +++ b/src/query/query.cpp @@ -31,7 +31,6 @@ #include #include #include -#include #include #include From ddb3345af8cf91d81039ba2828ae5f680fbd8178 Mon Sep 17 00:00:00 2001 From: Sebastian Piwell Date: Tue, 3 May 2016 14:00:51 -0400 Subject: [PATCH 2/3] Replace strings with enum --- modules/iswa/util/iswamanager.cpp | 4 ++-- scripts/iswa_startup.lua | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp index a4570423ad..95b4a2a493 100644 --- a/modules/iswa/util/iswamanager.cpp +++ b/modules/iswa/util/iswamanager.cpp @@ -154,11 +154,11 @@ std::shared_ptr ISWAManager::downloadDataToMemory(i void ISWAManager::update(){ for (auto it = _metadataFutures.begin(); it != _metadataFutures.end(); ){ if((*it)->isFinished) { - if((*it)->guiType == "TEXTURE"){ + if((*it)->guiType == _type[CygnetType::Texture]){ (*it)->type = CygnetType::Texture; (*it)->geom = CygnetGeometry::Plane; // (*it)->group = -1; - }else if ((*it)->guiType == "DATA"){ + }else if ((*it)->guiType == _type[CygnetType::Data]){ (*it)->type = CygnetType::Data; (*it)->geom = CygnetGeometry::Plane; // (*it)->group = 1; diff --git a/scripts/iswa_startup.lua b/scripts/iswa_startup.lua index dcfdeb88af..1f668d9980 100644 --- a/scripts/iswa_startup.lua +++ b/scripts/iswa_startup.lua @@ -1,6 +1,6 @@ --[[ OpenSpace startup script ]]-- -- This Lua script get executed once at the start of the application -openspace.iswa.addCygnet("-1,DATA,1"); -openspace.iswa.addCygnet("-2,DATA,1"); -openspace.iswa.addCygnet("-3,DATA,1"); \ No newline at end of file +openspace.iswa.addCygnet("-1,Data,1"); +openspace.iswa.addCygnet("-2,Data,1"); +openspace.iswa.addCygnet("-3,Data,1"); \ No newline at end of file From 5e5e9244f57e3accf6a0f79d7b1d6eef0a90a524 Mon Sep 17 00:00:00 2001 From: Sebastian Piwell Date: Tue, 3 May 2016 14:32:04 -0400 Subject: [PATCH 3/3] Created dataSphere --- modules/iswa/CMakeLists.txt | 4 ++ modules/iswa/iswamodule.cpp | 2 + modules/iswa/rendering/cygnetsphere.cpp | 46 ++++++++++++++++++++++ modules/iswa/rendering/cygnetsphere.h | 49 +++++++++++++++++++++++ modules/iswa/rendering/dataplane.h | 6 +-- modules/iswa/rendering/datasphere.cpp | 52 +++++++++++++++++++++++++ modules/iswa/rendering/datasphere.h | 50 ++++++++++++++++++++++++ modules/iswa/util/iswamanager.cpp | 14 ++++--- 8 files changed, 214 insertions(+), 9 deletions(-) create mode 100644 modules/iswa/rendering/cygnetsphere.cpp create mode 100644 modules/iswa/rendering/cygnetsphere.h create mode 100644 modules/iswa/rendering/datasphere.cpp create mode 100644 modules/iswa/rendering/datasphere.h diff --git a/modules/iswa/CMakeLists.txt b/modules/iswa/CMakeLists.txt index cb0db8dd8f..6a19f1e1cd 100644 --- a/modules/iswa/CMakeLists.txt +++ b/modules/iswa/CMakeLists.txt @@ -30,6 +30,8 @@ set(HEADER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/rendering/dataplane.h ${CMAKE_CURRENT_SOURCE_DIR}/rendering/textureplane.h ${CMAKE_CURRENT_SOURCE_DIR}/rendering/kameleonplane.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/cygnetsphere.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/datasphere.h ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspacecygnet.h ${CMAKE_CURRENT_SOURCE_DIR}/rendering/colorbar.h ${CMAKE_CURRENT_SOURCE_DIR}/util/iswamanager.h @@ -43,6 +45,8 @@ set(SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/rendering/dataplane.cpp ${CMAKE_CURRENT_SOURCE_DIR}/rendering/textureplane.cpp ${CMAKE_CURRENT_SOURCE_DIR}/rendering/kameleonplane.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/cygnetsphere.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/datasphere.cpp ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspacecygnet.cpp ${CMAKE_CURRENT_SOURCE_DIR}/rendering/colorbar.cpp ${CMAKE_CURRENT_SOURCE_DIR}/util/iswamanager.cpp diff --git a/modules/iswa/iswamodule.cpp b/modules/iswa/iswamodule.cpp index f3b7a28123..279305ed2c 100644 --- a/modules/iswa/iswamodule.cpp +++ b/modules/iswa/iswamodule.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include namespace openspace { @@ -49,6 +50,7 @@ namespace openspace { fRenderable->registerClass("TexturePlane"); fRenderable->registerClass("DataPlane"); fRenderable->registerClass("KameleonPlane"); + fRenderable->registerClass("DataSphere"); auto fScreenSpaceRenderable = FactoryManager::ref().factory(); ghoul_assert(fScreenSpaceRenderable, "No fScreenSpaceRenderable factory existed"); diff --git a/modules/iswa/rendering/cygnetsphere.cpp b/modules/iswa/rendering/cygnetsphere.cpp new file mode 100644 index 0000000000..cb5e4a4225 --- /dev/null +++ b/modules/iswa/rendering/cygnetsphere.cpp @@ -0,0 +1,46 @@ +// * Permission is hereby granted, free of charge, to any person obtaining a copy of this * +// * software and associated documentation files (the "Software"), to deal in the Software * +// * without restriction, including without limitation the rights to use, copy, modify, * +// * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * +// * permit persons to whom the Software is furnished to do so, subject to the following * +// * conditions: * +// * * +// * The above copyright notice and this permission notice shall be included in all copies * +// * or substantial portions of the Software. * +// * * +// * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * +// * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * +// * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * +// * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * +// * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * +// * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * +// ****************************************************************************************/ + +#include +#include +#include +#include +#include + +namespace openspace{ + +CygnetSphere::CygnetSphere(const ghoul::Dictionary& dictionary) + :ISWACygnet(dictionary) + ,_futureObject(nullptr) +{} + +CygnetSphere::~CygnetSphere(){} + +bool CygnetSphere::isReady() const{ + return true; +} + +void CygnetSphere::render(const RenderData& data){ + +} + +void CygnetSphere::update(const UpdateData& data){ + +} + +} //namespace openspace \ No newline at end of file diff --git a/modules/iswa/rendering/cygnetsphere.h b/modules/iswa/rendering/cygnetsphere.h new file mode 100644 index 0000000000..2c4234d6dd --- /dev/null +++ b/modules/iswa/rendering/cygnetsphere.h @@ -0,0 +1,49 @@ +/***************************************************************************************** +* * +* OpenSpace * +* * +* Copyright (c) 2014-2015 * +* * +* Permission is hereby granted, free of charge, to any person obtaining a copy of this * +* software and associated documentation files (the "Software"), to deal in the Software * +* without restriction, including without limitation the rights to use, copy, modify, * +* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * +* permit persons to whom the Software is furnished to do so, subject to the following * +* conditions: * +* * +* The above copyright notice and this permission notice shall be included in all copies * +* or substantial portions of the Software. * +* * +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * +* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * +* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * +* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * +* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * +* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * +****************************************************************************************/ + +#ifndef __CYGNETSPHERE_H__ +#define __CYGNETSPHERE_H__ + +#include + +namespace openspace{ +class CygnetSphere : public ISWACygnet { +public: + CygnetSphere(const ghoul::Dictionary& dictionary); + ~CygnetSphere(); + + virtual bool isReady() const override; + virtual void render(const RenderData& data) override; + virtual void update(const UpdateData& data) override; + +protected: + virtual bool loadTexture() = 0; + virtual bool updateTexture() = 0; + + std::shared_ptr _futureObject; +}; + +} //namespace openspace + +#endif // __CYGNETSPHERE_H__ \ No newline at end of file diff --git a/modules/iswa/rendering/dataplane.h b/modules/iswa/rendering/dataplane.h index 565ab511c9..f9c2e811ba 100644 --- a/modules/iswa/rendering/dataplane.h +++ b/modules/iswa/rendering/dataplane.h @@ -46,12 +46,12 @@ friend class ISWAGroup; // virtual void update(const UpdateData& data) override; //moved to cygnetPlane protected: - void transferFunctionsFile(std::string tfPath){ _transferFunctionsFile.setValue(tfPath); }; - void normValues(glm::vec2 normValues){ _normValues.setValue(normValues); }; - void backgroundValues(glm::vec2 backgroundValues){ _backgroundValues.setValue(backgroundValues); }; void useLog(bool useLog){ _useLog.setValue(useLog); }; + void normValues(glm::vec2 normValues){ _normValues.setValue(normValues); }; void useHistogram(bool useHistogram){ _useHistogram.setValue(useHistogram); }; void dataOptions(std::vector options){ _dataOptions.setValue(options); }; + void transferFunctionsFile(std::string tfPath){ _transferFunctionsFile.setValue(tfPath); }; + void backgroundValues(glm::vec2 backgroundValues){ _backgroundValues.setValue(backgroundValues); }; // const std::vector& dataOptions() const {return _dataOptions.options(); }; diff --git a/modules/iswa/rendering/datasphere.cpp b/modules/iswa/rendering/datasphere.cpp new file mode 100644 index 0000000000..5dafc28b92 --- /dev/null +++ b/modules/iswa/rendering/datasphere.cpp @@ -0,0 +1,52 @@ +/***************************************************************************************** +* * +* OpenSpace * +* * +* Copyright (c) 2014-2015 * +* * +* Permission is hereby granted, free of charge, to any person obtaining a copy of this * +* software and associated documentation files (the "Software"), to deal in the Software * +* without restriction, including without limitation the rights to use, copy, modify, * +* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * +* permit persons to whom the Software is furnished to do so, subject to the following * +* conditions: * +* * +* The above copyright notice and this permission notice shall be included in all copies * +* or substantial portions of the Software. * +* * +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * +* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * +* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * +* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * +* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * +* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * +****************************************************************************************/ + +#include + +namespace openspace { + +DataSphere::DataSphere(const ghoul::Dictionary& dictionary) + :CygnetSphere(dictionary) +{} + +DataSphere::~DataSphere(){} + + +bool DataSphere::initialize(){ + return true; +} + +bool DataSphere::deinitialize(){ + return true; +} + +bool DataSphere::loadTexture(){ + return true; +} + +bool DataSphere::updateTexture(){ + return true; +} + +} //namespace openspace \ No newline at end of file diff --git a/modules/iswa/rendering/datasphere.h b/modules/iswa/rendering/datasphere.h new file mode 100644 index 0000000000..07fb676493 --- /dev/null +++ b/modules/iswa/rendering/datasphere.h @@ -0,0 +1,50 @@ +/***************************************************************************************** +* * +* OpenSpace * +* * +* Copyright (c) 2014-2015 * +* * +* Permission is hereby granted, free of charge, to any person obtaining a copy of this * +* software and associated documentation files (the "Software"), to deal in the Software * +* without restriction, including without limitation the rights to use, copy, modify, * +* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * +* permit persons to whom the Software is furnished to do so, subject to the following * +* conditions: * +* * +* The above copyright notice and this permission notice shall be included in all copies * +* or substantial portions of the Software. * +* * +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * +* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * +* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * +* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * +* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * +* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * +****************************************************************************************/ + +#ifndef __DATASPHERE_H__ +#define __DATASPHERE_H__ + +#include + +namespace openspace{ + +class DataSphere : public CygnetSphere { +public: + DataSphere(const ghoul::Dictionary& dictionary); + ~DataSphere(); + + virtual bool initialize() override; + virtual bool deinitialize() override; + +protected: + +private: + virtual bool loadTexture() override; + virtual bool updateTexture() override; +}; + + +} //namespace openspace + +#endif //__DATASPHERE_H__ diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp index 95b4a2a493..09cf3396f3 100644 --- a/modules/iswa/util/iswamanager.cpp +++ b/modules/iswa/util/iswamanager.cpp @@ -23,20 +23,22 @@ ****************************************************************************************/ #include -#include -#include #include #include -#include +#include #include -#include +#include +#include + #include +#include +#include +#include +#include #include #include #include #include -#include -#include #include "iswamanager_lua.inl";