From e75fe4294314fe47118fe11e4c1a7e41e9cc3d56 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Fri, 16 Apr 2021 12:49:44 +0200 Subject: [PATCH] Enable support for single double radius in SizeReferenceTileProvider (closes #1562) --- .../moon/layers/overlays/size_reference.asset | 15 +++++++++++++++ modules/globebrowsing/src/tileprovider.cpp | 4 ++++ 2 files changed, 19 insertions(+) create mode 100644 data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/size_reference.asset diff --git a/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/size_reference.asset b/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/size_reference.asset new file mode 100644 index 0000000000..030be3572d --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/moon/layers/overlays/size_reference.asset @@ -0,0 +1,15 @@ +local moonAsset = asset.require("./../../moon").Moon +local globeIdentifier = moonAsset.Identifier + +local layer ={ + Identifier = "Size_Reference", + Name = "Size Reference", + Type = "SizeReferenceTileLayer", + Radii = moonAsset.Renderable.Radii +} + +asset.onInitialize(function () + openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer) +end) + +asset.export("layer", layer) diff --git a/modules/globebrowsing/src/tileprovider.cpp b/modules/globebrowsing/src/tileprovider.cpp index 379857325d..ddf1200ed9 100644 --- a/modules/globebrowsing/src/tileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider.cpp @@ -657,6 +657,10 @@ SizeReferenceTileProvider::SizeReferenceTileProvider(const ghoul::Dictionary& di if (dictionary.hasValue(sizereferenceprovider::KeyRadii)) { ellipsoid = dictionary.value(sizereferenceprovider::KeyRadii); } + else if (dictionary.hasValue(sizereferenceprovider::KeyRadii)) { + const double r = dictionary.value(sizereferenceprovider::KeyRadii); + ellipsoid = glm::dvec3(r, r, r); + } }