mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-22 12:59:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some more cleanup with nested namespaces

Browse Source
This commit is contained in:
Alexander Bock
2017-07-16 11:59:01 -04:00
parent 26682669ff
commit 096e751de2
38 changed files with 118 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/space/rendering/simplespheregeometry.cpp
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -28,19 +28,13 @@
#include <openspace/rendering/renderable.h>
namespace {
const std::string _loggerCat = "SimpleSphereGeometry";
}
const char* _loggerCat = "SimpleSphereGeometry";
namespace openspace {
namespace constants {
namespace simplespheregeometry {
const char* keyRadius = "Radius";
const char* keySegments = "Segments";
} // namespace simplespheregeometry
}
} // namespace
namespace planetgeometry {
namespace openspace::planetgeometry {
SimpleSphereGeometry::SimpleSphereGeometry(const ghoul::Dictionary& dictionary)
: PlanetGeometry()
@@ -53,9 +47,6 @@ SimpleSphereGeometry::SimpleSphereGeometry(const ghoul::Dictionary& dictionary)
, _segments("segments", "Segments", 20, 1, 5000)
, _sphere(nullptr)
{
using constants::simplespheregeometry::keyRadius;
using constants::simplespheregeometry::keySegments;
float sphereRadius = 0.f;
glm::vec3 ellipsoidRadius;
if (dictionary.getValue(keyRadius, sphereRadius)) {
@@ -115,5 +106,4 @@ void SimpleSphereGeometry::createSphere(){
_sphere->initialize();
}
} // namespace planetgeometry
} // namespace openspace
} // namespace openspace::planetgeometry