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