diff --git a/modules/iswa/rendering/cygnetsphere.cpp b/modules/iswa/rendering/cygnetsphere.cpp index 7c13900c24..ea055728e5 100644 --- a/modules/iswa/rendering/cygnetsphere.cpp +++ b/modules/iswa/rendering/cygnetsphere.cpp @@ -32,12 +32,17 @@ namespace openspace{ CygnetSphere::CygnetSphere(const ghoul::Dictionary& dictionary) :IswaCygnet(dictionary) ,_sphere(nullptr) -{} +{ + float radius; + dictionary.getValue("Radius", radius); + _radius = radius; + +} CygnetSphere::~CygnetSphere(){} bool CygnetSphere::createGeometry(){ - PowerScaledScalar radius = PowerScaledScalar(6.371f, 6.01); + PowerScaledScalar radius = PowerScaledScalar(6.371f*_radius, 6.0); int segments = 100; _sphere = std::make_shared(radius, segments); _sphere->initialize(); diff --git a/modules/iswa/rendering/cygnetsphere.h b/modules/iswa/rendering/cygnetsphere.h index 02a375d13c..213f4e927d 100644 --- a/modules/iswa/rendering/cygnetsphere.h +++ b/modules/iswa/rendering/cygnetsphere.h @@ -45,6 +45,8 @@ private: virtual bool createGeometry() override; virtual bool destroyGeometry() override; virtual void renderGeometry() override; + + float _radius; }; } //namespace openspace diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp index b1934928eb..157f84018b 100644 --- a/modules/iswa/util/iswamanager.cpp +++ b/modules/iswa/util/iswamanager.cpp @@ -348,7 +348,7 @@ std::string IswaManager::jsonSphereToLuaTable(std::shared_ptr da std::string frame = j["standard_grid_target"]; std::string coordinateType = j["grid_1_type"]; std::string updateTime = j["output_time_interval"]; - int radius = j["radius"]; + float radius = j["radius"]; glm::vec4 spatialScale(6.371f, 6.371f, 6.371f, 6);