diff --git a/modules/base/CMakeLists.txt b/modules/base/CMakeLists.txt index d6e56dd995..5f8c46ca69 100644 --- a/modules/base/CMakeLists.txt +++ b/modules/base/CMakeLists.txt @@ -38,7 +38,6 @@ set(HEADER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablestars.h ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrail.h ${CMAKE_CURRENT_SOURCE_DIR}/rendering/simplespheregeometry.h - ${CMAKE_CURRENT_SOURCE_DIR}/ephemeris/dynamicephemeris.h ${CMAKE_CURRENT_SOURCE_DIR}/ephemeris/spiceephemeris.h ${CMAKE_CURRENT_SOURCE_DIR}/ephemeris/staticephemeris.h ) @@ -58,7 +57,6 @@ set(SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablestars.cpp ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrail.cpp ${CMAKE_CURRENT_SOURCE_DIR}/rendering/simplespheregeometry.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/ephemeris/dynamicephemeris.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ephemeris/spiceephemeris.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ephemeris/staticephemeris.cpp ) diff --git a/modules/base/basemodule.cpp b/modules/base/basemodule.cpp index 1a7c095bdf..6d5d24121b 100644 --- a/modules/base/basemodule.cpp +++ b/modules/base/basemodule.cpp @@ -44,7 +44,6 @@ #include #include -#include #include #include @@ -75,7 +74,6 @@ void BaseModule::internalInitialize() { auto fEphemeris = FactoryManager::ref().factory(); ghoul_assert(fEphemeris, "Ephemeris factory was not created"); fEphemeris->registerClass("Static"); - fEphemeris->registerClass("Dynamic"); fEphemeris->registerClass("Spice"); auto fPlanetGeometry = FactoryManager::ref().factory(); diff --git a/modules/base/ephemeris/dynamicephemeris.cpp b/modules/base/ephemeris/dynamicephemeris.cpp deleted file mode 100644 index 4efb8274fc..0000000000 --- a/modules/base/ephemeris/dynamicephemeris.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/***************************************************************************************** - * * - * OpenSpace * - * * - * Copyright (c) 2014-2016 * - * * - * 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 { - const std::string KeyPosition = "Position"; -} - -namespace openspace { - -DynamicEphemeris::DynamicEphemeris(const ghoul::Dictionary& dictionary) - : _position(0.f, 0.f, 0.f, 0.f) -{ - const bool hasPosition = dictionary.hasKeyAndValue(KeyPosition); - if (hasPosition) { - glm::vec4 tmp; - dictionary.getValue(KeyPosition, tmp); - _position = tmp; - } -} - -DynamicEphemeris::~DynamicEphemeris() {} - -const psc& DynamicEphemeris::position() const { - return _position; -} - -void DynamicEphemeris::setPosition(psc pos) { - _position = pos; -} - -void DynamicEphemeris::update(const UpdateData&) {} - -} // namespace openspace \ No newline at end of file diff --git a/modules/base/ephemeris/dynamicephemeris.h b/modules/base/ephemeris/dynamicephemeris.h deleted file mode 100644 index f6d679d7dd..0000000000 --- a/modules/base/ephemeris/dynamicephemeris.h +++ /dev/null @@ -1,46 +0,0 @@ -/***************************************************************************************** - * * - * OpenSpace * - * * - * Copyright (c) 2014-2016 * - * * - * 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 __DYNAMICEPHEMERIS_H__ -#define __DYNAMICEPHEMERIS_H__ - -#include - -namespace openspace { - -class DynamicEphemeris: public Ephemeris { -public: - DynamicEphemeris(const ghoul::Dictionary& dictionary - = ghoul::Dictionary()); - virtual ~DynamicEphemeris(); - virtual const psc& position() const; - virtual void update(const UpdateData& data) override; - void setPosition(psc pos); -private: - psc _position; -}; - -} // namespace openspace - -#endif // __DYNAMICEPHEMERIS_H__