Real Radius on Ionosphere

This commit is contained in:
Sebastian Piwell
2016-05-16 17:31:12 -04:00
parent 53eb17bb66
commit 562a986a43
3 changed files with 10 additions and 3 deletions

View File

@@ -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<PowerScaledSphere>(radius, segments);
_sphere->initialize();

View File

@@ -45,6 +45,8 @@ private:
virtual bool createGeometry() override;
virtual bool destroyGeometry() override;
virtual void renderGeometry() override;
float _radius;
};
} //namespace openspace

View File

@@ -348,7 +348,7 @@ std::string IswaManager::jsonSphereToLuaTable(std::shared_ptr<MetadataFuture> 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);