mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-13 17:09:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Removed iswacontainer

Browse Source
This commit is contained in:
Sebastian Piwell
2016-05-03 13:46:02 -04:00
parent dfd1968f0b
commit 7eae57b02f
7 changed files with 1 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/scene/iswa/iswa.mod
View File

@@ -1,13 +1,7 @@
return {
{
Name = "iSWA",
Parent = "SolarSystem",
Renderable = {
Type = "ISWAContainer",
TextureCygnets = "[]",
DataCygnets = "[-2]",
Frame = "GALACTIC"
},
Parent = "Root",
Ephemeris = {
Type = "Spice",
Body = "Sun",

2
modules/iswa/CMakeLists.txt
View File

@@ -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

2
modules/iswa/iswamodule.cpp
View File

@@ -29,7 +29,6 @@
#include <ghoul/misc/assert.h>
#include <modules/iswa/rendering/iswacontainer.h>
#include <modules/iswa/rendering/textureplane.h>
#include <modules/iswa/rendering/dataplane.h>
#include <modules/iswa/rendering/kameleonplane.h>
@@ -44,7 +43,6 @@ namespace openspace {
auto fRenderable = FactoryManager::ref().factory<Renderable>();
ghoul_assert(fRenderable, "No renderable factory existed");
fRenderable->registerClass<ISWAContainer>("ISWAContainer");
fRenderable->registerClass<TexturePlane>("TexturePlane");
fRenderable->registerClass<DataPlane>("DataPlane");
fRenderable->registerClass<KameleonPlane>("KameleonPlane");

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

@@ -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 <modules/iswa/rendering/iswacontainer.h>
#include <ghoul/filesystem/filesystem>
#include <modules/kameleon/include/kameleonwrapper.h>
#include <modules/iswa/rendering/dataplane.h>
#include <modules/iswa/rendering/textureplane.h>
#include <modules/iswa/rendering/screenspacecygnet.h>
#include <modules/iswa/util/iswamanager.h>
#include <openspace/rendering/renderable.h>
#include <modules/iswa/ext/json/json.hpp>
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){}
}

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

@@ -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 <openspace/rendering/renderable.h>
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

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

@@ -28,7 +28,6 @@
#include <modules/iswa/rendering/dataplane.h>
#include <modules/iswa/rendering/textureplane.h>
#include <openspace/util/time.h>
#include <modules/iswa/rendering/iswacontainer.h>
#include <modules/iswa/rendering/screenspacecygnet.h>
#include <modules/iswa/ext/json/json.hpp>
#include <fstream>

1
src/query/query.cpp
View File

@@ -31,7 +31,6 @@
#include <openspace/scene/scene.h>
#include <openspace/scene/scenegraphnode.h>
#include <modules/iswa/rendering/iswacygnet.h>
#include <modules/iswa/rendering/iswacontainer.h>
#include <openspace/rendering/screenspacerenderable.h>
#include <modules/iswa/rendering/iswagroup.h>