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

merge

Browse Source
This commit is contained in:
Jonathan Fransson
2019-04-08 09:21:59 -06:00
committed by Elon
parent 963e3e706b
commit 95079bb81a
4 changed files with 912 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/assets/scene/solarsystem/planets/earth/satellites/satellites_shared.asset
View File

@@ -54,7 +54,7 @@ local addSatelliteGroupObjects = function(group, tleFolder, shouldAddDuplicates)
Identifier = title,
Parent = transforms.EarthInertial.Identifier,
Renderable = {
Type = "ElonsTest",
Type = "RenderableSatellites",
--Translation = {
-- Type = "TLETranslation",
@@ -62,10 +62,8 @@ local addSatelliteGroupObjects = function(group, tleFolder, shouldAddDuplicates)
-- Observer = transforms.EarthInertial.Identifier,
-- File = file
-- },
Path = file,
Segments = 160,
Segments = 1,
EccentricityColumn = "bubbis",
SemiMajorAxisColumn = "bubbis",
SemiMajorAxisUnit = 1,

1531
modules/space/rendering/renderablesatellites.cpp
View File

File diff suppressed because it is too large Load Diff

250
modules/space/rendering/renderablesatellites.h
View File

@@ -1,125 +1,125 @@
//// /****************************************************************************************
//// * *
//// * OpenSpace *
//// * *
//// * Copyright (c) 2014-2018 *
//// * *
//// * 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 <openspace/rendering/renderable.h>
//
//#include <modules/base/rendering/renderabletrail.h>
//#include <modules/space/translation/keplertranslation.h>
//
//// #include <openspace/util/circlegeometry.h>
//#include <openspace/properties/stringproperty.h>
//#include <openspace/properties/scalar/uintproperty.h>
//
//#include <ghoul/opengl/programobject.h>
//#include <ghoul/misc/objectmanager.h>
//
//#ifndef __OPENSPACE_MODULE_BASE___RenderableSatellites___H__
//#define __OPENSPACE_MODULE_BASE___RenderableSatellites___H__
//
//namespace openspace {
//
// class RenderableSatellites : public Renderable {
// public:
// RenderableSatellites(const ghoul::Dictionary& dictionary);
// virtual ~RenderableSatellites();
//
// void initialize() override;
// void deinitialize() override;
// void initializeGL() override;
// void deinitializeGL() override;
//
// bool isReady() const override;
//
// void render(const RenderData& data, RendererTasks& rendererTask) override;
// void update(const UpdateData& data) override;
//
// static documentation::Documentation Documentation();
//
// private:
// /// The layout of the VBOs
// struct TrailVBOLayout {
// float x, y, z, time;
// };
//
// KeplerTranslation _keplerTranslator;
// std::vector<KeplerTranslation::KeplerOrbit> TLEData;
//
// /// The backend storage for the vertex buffer object containing all points for this
// /// trail.
// std::vector<TrailVBOLayout> _vertexBufferData;
//
// /// The index array that is potentially used in the draw call. If this is empty, no
// /// element draw call is used.
// std::vector<unsigned int> _indexBufferData;
//
// GLuint _vertexArray;
// GLuint _vertexBuffer;
// GLuint _indexBuffer;
//
// void readFromCsvFile();
// void updateBuffers();
//
// std::vector<KeplerTranslation::KeplerOrbit> _orbits;
// ghoul::opengl::ProgramObject* _programObject;
// //ghoul::ObjectManager* _objectManager;
//
//
// properties::StringProperty _path;
// properties::UIntProperty _nSegments;
//
// properties::StringProperty _eccentricityColumnName;
// properties::StringProperty _semiMajorAxisColumnName;
// properties::DoubleProperty _semiMajorAxisUnit;
// properties::StringProperty _inclinationColumnName;
// properties::StringProperty _ascendingNodeColumnName;
// properties::StringProperty _argumentOfPeriapsisColumnName;
// properties::StringProperty _meanAnomalyAtEpochColumnName;
// properties::StringProperty _epochColumnName;
//
// RenderableTrail::Appearance _appearance;
//
// UniformCache(opacity, modelView, projection, color, useLineFade, lineFade)
// _uniformCache;
//
// /**
// * Reads the provided TLE file and calles the KeplerTranslation::setKeplerElments
// * method with the correct values. If \p filename is a valid TLE file but contains
// * disallowed values (see KeplerTranslation::setKeplerElements), a
// * KeplerTranslation::RangeError is thrown.
// *
// * \param filename The path to the file that contains the TLE file.
// * \param lineNum The line number in the file where the set of 3 TLE lines starts
// *
// * \throw std::system_error if the TLE file is malformed (does not contain at least
// * two lines that start with \c 1 and \c 2.
// * \throw KeplerTranslation::RangeError If the Keplerian elements are outside of
// * the valid range supported by Kepler::setKeplerElements
// * \pre The \p filename must exist
// */
// void readTLEFile(const std::string& filename);
// };
//
//#endif // __OPENSPACE_MODULE_BASE___RenderableSatellites___H__
//
//}
// /****************************************************************************************
// * *
// * OpenSpace *
// * *
// * Copyright (c) 2014-2018 *
// * *
// * 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 <openspace/rendering/renderable.h>
#include <modules/base/rendering/renderabletrail.h>
#include <modules/space/translation/keplertranslation.h>
// #include <openspace/util/circlegeometry.h>
#include <openspace/properties/stringproperty.h>
#include <openspace/properties/scalar/uintproperty.h>
#include <ghoul/opengl/programobject.h>
#include <ghoul/misc/objectmanager.h>
#ifndef __OPENSPACE_MODULE_BASE___RenderableSatellites___H__
#define __OPENSPACE_MODULE_BASE___RenderableSatellites___H__
namespace openspace {
class RenderableSatellites : public Renderable {
public:
RenderableSatellites(const ghoul::Dictionary& dictionary);
//virtual ~RenderableSatellites();
void initialize() override;
void deinitialize() override;
void initializeGL() override;
void deinitializeGL() override;
bool isReady() const override;
void render(const RenderData& data, RendererTasks& rendererTask) override;
void update(const UpdateData& data) override;
static documentation::Documentation Documentation();
private:
/// The layout of the VBOs
struct TrailVBOLayout {
float x, y, z, time;
};
KeplerTranslation _keplerTranslator;
std::vector<KeplerTranslation::KeplerOrbit> TLEData;
/// The backend storage for the vertex buffer object containing all points for this
/// trail.
std::vector<TrailVBOLayout> _vertexBufferData;
/// The index array that is potentially used in the draw call. If this is empty, no
/// element draw call is used.
std::vector<unsigned int> _indexBufferData;
GLuint _vertexArray;
GLuint _vertexBuffer;
GLuint _indexBuffer;
void readFromCsvFile();
void updateBuffers();
std::vector<KeplerTranslation::KeplerOrbit> _orbits;
ghoul::opengl::ProgramObject* _programObject;
//ghoul::ObjectManager* _objectManager;
properties::StringProperty _path;
properties::UIntProperty _nSegments;
properties::StringProperty _eccentricityColumnName;
properties::StringProperty _semiMajorAxisColumnName;
properties::DoubleProperty _semiMajorAxisUnit;
properties::StringProperty _inclinationColumnName;
properties::StringProperty _ascendingNodeColumnName;
properties::StringProperty _argumentOfPeriapsisColumnName;
properties::StringProperty _meanAnomalyAtEpochColumnName;
properties::StringProperty _epochColumnName;
//RenderableTrail::Appearance _appearance;
// UniformCache(opacity, modelView, projection, color, useLineFade, lineFade)
// _uniformCache;
/**
* Reads the provided TLE file and calles the KeplerTranslation::setKeplerElments
* method with the correct values. If \p filename is a valid TLE file but contains
* disallowed values (see KeplerTranslation::setKeplerElements), a
* KeplerTranslation::RangeError is thrown.
*
* \param filename The path to the file that contains the TLE file.
* \param lineNum The line number in the file where the set of 3 TLE lines starts
*
* \throw std::system_error if the TLE file is malformed (does not contain at least
* two lines that start with \c 1 and \c 2.
* \throw KeplerTranslation::RangeError If the Keplerian elements are outside of
* the valid range supported by Kepler::setKeplerElements
* \pre The \p filename must exist
*/
void readTLEFile(const std::string& filename);
};
#endif // __OPENSPACE_MODULE_BASE___RenderableSatellites___H__
}

14
modules/space/spacemodule.cpp
View File

@@ -22,6 +22,9 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_MODULE_SPACE___RENDERABLESATELLITES___H__
#define __OPENSPACE_MODULE_SPACE___RENDERABLESATELLITES___H__
#include <modules/space/spacemodule.h>
#include <modules/space/rendering/renderablesatellites.h>
@@ -29,7 +32,7 @@
#include <modules/space/rendering/renderableplanet.h>
#include <modules/space/rendering/renderablerings.h>
#include <modules/space/rendering/renderablestars.h>
#include <modules/space/rendering/simplespheregeometry.h>
#include <modules/space/rendering/simplespheregeometry.h>s
#include <modules/space/rendering/elonstest.h>
#include <modules/space/translation/keplertranslation.h>
#include <modules/space/translation/spicetranslation.h>
@@ -82,7 +85,9 @@ void SpaceModule::internalInitialize(const ghoul::Dictionary&) {
fRenderable->registerClass<RenderablePlanet>("RenderablePlanet");
fRenderable->registerClass<RenderableRings>("RenderableRings");
fRenderable->registerClass<RenderableStars>("RenderableStars");
fRenderable->registerClass<ElonsTest>("ElonsTest");
fRenderable->registerClass<RenderableSatellites>("RenderableSatellites");
//fRenderable->registerClass<ElonsTest>("ElonsTest");
auto fTranslation = FactoryManager::ref().factory<Translation>();
ghoul_assert(fTranslation, "Ephemeris factory was not created");
@@ -112,7 +117,8 @@ std::vector<documentation::Documentation> SpaceModule::documentations() const {
RenderablePlanet::Documentation(),
RenderableRings::Documentation(),
RenderableStars::Documentation(),
ElonsTest::Documentation(),
RenderableSatellites::Documentation(),
//ElonsTest::Documentation(),
SpiceRotation::Documentation(),
SpiceTranslation::Documentation(),
KeplerTranslation::Documentation(),
@@ -124,3 +130,5 @@ std::vector<documentation::Documentation> SpaceModule::documentations() const {
}
} // namespace openspace
#endif // __OPENSPACE_MODULE_SPACE___RENDERABLESATELLITES___H__