Pr/trails (#170)

* Implement new RenderableTrails as abstract base class
  - Implement RenderableTrailsOrbit and RenderableTrailsTrajectory as concrete instances
Remove old RenderableTrails and RenderableTrailsNew classes
Adapt mod files to the new structure

* Addressed Pull Request comments
This commit is contained in:
Alexander Bock
2016-11-23 10:35:46 +01:00
committed by GitHub
parent db923209c3
commit 683fc8ee53
73 changed files with 2002 additions and 1653 deletions
+22 -9
View File
@@ -32,11 +32,12 @@
#include <openspace/documentation/verifier.h>
namespace {
const std::string KeyBody = "Body";
const std::string KeyObserver = "Observer";
const std::string KeyKernels = "Kernels";
const char* KeyBody = "Body";
const char* KeyObserver = "Observer";
const char* KeyFrame = "Frame";
const char* KeyKernels = "Kernels";
const std::string ReferenceFrame = "GALACTIC";
const char* DefaultReferenceFrame = "GALACTIC";
}
namespace openspace {
@@ -44,7 +45,7 @@ namespace openspace {
Documentation SpiceTranslation::Documentation() {
using namespace openspace::documentation;
return {
return{
"Spice Translation",
"base_translation_spicetranslation",
{
@@ -71,12 +72,19 @@ Documentation SpiceTranslation::Documentation() {
"integer id code (such as '0').",
Optional::No
},
{
KeyFrame,
new StringAnnotationVerifier(
"A valid SPICE NAIF name for a reference frame"
),
"This is the SPICE NAIF name for the reference frame in which the "
"position should be retrieved. The default value is GALACTIC",
Optional::Yes
},
{
KeyKernels,
new OrVerifier(
new TableVerifier({
{ "*", new StringVerifier }
}),
new StringListVerifier,
new StringVerifier
),
"A single kernel or list of kernels that this SpiceTranslation depends "
@@ -92,6 +100,7 @@ Documentation SpiceTranslation::Documentation() {
SpiceTranslation::SpiceTranslation(const ghoul::Dictionary& dictionary)
: _target("target", "Target", "")
, _origin("origin", "Origin", "")
, _frame("frame", "Reference Frame", DefaultReferenceFrame)
, _kernelsLoadedSuccessfully(true)
{
documentation::testSpecificationAndThrow(
@@ -103,6 +112,10 @@ SpiceTranslation::SpiceTranslation(const ghoul::Dictionary& dictionary)
_target = dictionary.value<std::string>(KeyBody);
_origin = dictionary.value<std::string>(KeyObserver);
if (dictionary.hasKey(KeyFrame)) {
_frame = dictionary.value<std::string>(KeyFrame);
}
auto loadKernel = [](const std::string& kernel) {
if (!FileSys.fileExists(kernel)) {
throw SpiceManager::SpiceException("Kernel '" + kernel + "' does not exist");
@@ -142,7 +155,7 @@ glm::dvec3 SpiceTranslation::position() const {
void SpiceTranslation::update(const UpdateData& data) {
double lightTime = 0.0;
_position = SpiceManager::ref().targetPosition(
_target, _origin, ReferenceFrame, {}, data.time, lightTime
_target, _origin, _frame, {}, data.time, lightTime
) * glm::pow(10.0, 3.0);
}