mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-07 12:10:52 -06:00
merge
This commit is contained in:
Jonathan Fransson
committed by
ElonOlsson
ElonOlsson
parent
772eaed940
commit
e01dacff75
File diff suppressed because it is too large
Load Diff
@@ -1,128 +1,128 @@
|
||||
// // /****************************************************************************************
|
||||
// // * *
|
||||
// // * 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. *
|
||||
// // ****************************************************************************************/
|
||||
// /****************************************************************************************
|
||||
// * *
|
||||
// * 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 <openspace/rendering/renderable.h>
|
||||
|
||||
// #include <modules/base/rendering/renderabletrail.h>
|
||||
// #include <modules/space/translation/keplertranslation.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 <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>
|
||||
#include <ghoul/opengl/programobject.h>
|
||||
#include <ghoul/misc/objectmanager.h>
|
||||
|
||||
// #ifndef __OPENSPACE_MODULE_BASE___RenderableSatellites___H__
|
||||
// #define __OPENSPACE_MODULE_BASE___RenderableSatellites___H__
|
||||
#ifndef __OPENSPACE_MODULE_BASE___RenderableSatellites___H__
|
||||
#define __OPENSPACE_MODULE_BASE___RenderableSatellites___H__
|
||||
|
||||
// namespace openspace {
|
||||
namespace openspace {
|
||||
|
||||
// class RenderableSatellites : public Renderable {
|
||||
// public:
|
||||
// RenderableSatellites(const ghoul::Dictionary& dictionary);
|
||||
// virtual ~RenderableSatellites();
|
||||
class RenderableSatellites : public Renderable {
|
||||
public:
|
||||
RenderableSatellites(const ghoul::Dictionary& dictionary);
|
||||
virtual ~RenderableSatellites();
|
||||
|
||||
// void initialize() override;
|
||||
// void deinitialize() override;
|
||||
// void initializeGL() override;
|
||||
// void deinitializeGL() override;
|
||||
void initialize() override;
|
||||
void deinitialize() override;
|
||||
void initializeGL() override;
|
||||
void deinitializeGL() override;
|
||||
|
||||
// bool isReady() const override;
|
||||
bool isReady() const override;
|
||||
|
||||
// void render(const RenderData& data, RendererTasks& rendererTask) override;
|
||||
// void update(const UpdateData& data) override;
|
||||
void render(const RenderData& data, RendererTasks& rendererTask) override;
|
||||
void update(const UpdateData& data) override;
|
||||
|
||||
// /*
|
||||
// void setKeplerElements(double eccentricity, double semiMajorAxis, double inclination,
|
||||
// double ascendingNode, double argumentOfPeriapsis, double meanAnomalyAtEpoch,
|
||||
// double orbitalPeriod, double epoch);
|
||||
// */
|
||||
/*
|
||||
void setKeplerElements(double eccentricity, double semiMajorAxis, double inclination,
|
||||
double ascendingNode, double argumentOfPeriapsis, double meanAnomalyAtEpoch,
|
||||
double orbitalPeriod, double epoch);
|
||||
*/
|
||||
|
||||
// static documentation::Documentation Documentation();
|
||||
static documentation::Documentation Documentation();
|
||||
|
||||
// private:
|
||||
// /// The layout of the VBOs
|
||||
// struct TrailVBOLayout {
|
||||
// float x, y, z, time;
|
||||
// };
|
||||
private:
|
||||
/// The layout of the VBOs
|
||||
struct TrailVBOLayout {
|
||||
float x, y, z, time;
|
||||
};
|
||||
|
||||
// /// The backend storage for the vertex buffer object containing all points for this
|
||||
// /// trail.
|
||||
// std::vector<TrailVBOLayout> _vertexBufferData;
|
||||
/// 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;
|
||||
/// 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;
|
||||
GLuint _vertexArray;
|
||||
GLuint _vertexBuffer;
|
||||
GLuint _indexBuffer;
|
||||
|
||||
// void readFromCsvFile();
|
||||
// void updateBuffers();
|
||||
void readFromCsvFile();
|
||||
void updateBuffers();
|
||||
|
||||
// std::vector<KeplerTranslation::KeplerOrbit> _orbits;
|
||||
// ghoul::opengl::ProgramObject* _programObject;
|
||||
// //ghoul::ObjectManager* _objectManager;
|
||||
std::vector<KeplerTranslation::KeplerOrbit> _orbits;
|
||||
ghoul::opengl::ProgramObject* _programObject;
|
||||
//ghoul::ObjectManager* _objectManager;
|
||||
|
||||
|
||||
// properties::StringProperty _path;
|
||||
// properties::UIntProperty _nSegments;
|
||||
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;
|
||||
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;
|
||||
RenderableTrail::Appearance _appearance;
|
||||
|
||||
// UniformCache(opacity, modelView, projection, color, useLineFade, lineFade)
|
||||
// _uniformCache;
|
||||
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, int lineNum);
|
||||
// };
|
||||
/**
|
||||
* 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__
|
||||
#endif // __OPENSPACE_MODULE_BASE___RenderableSatellites___H__
|
||||
|
||||
// }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user