mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 11:39:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Started switching OpenSpace projects to nested namespaces

Browse Source 
Various cleanups
This commit is contained in:
Alexander Bock
2017-07-15 20:01:55 -04:00
parent 9d4215695d
commit 4dba552fd1
331 changed files with 1126 additions and 1917 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/fieldlines/fieldlinesmodule.cpp
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -33,9 +33,7 @@
namespace openspace {
FieldlinesModule::FieldlinesModule()
: OpenSpaceModule(Name)
{}
FieldlinesModule::FieldlinesModule() : OpenSpaceModule(Name) {}
void FieldlinesModule::internalInitialize() {
auto fRenderable = FactoryManager::ref().factory<Renderable>();

6
modules/fieldlines/rendering/renderablefieldlines.cpp
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -38,7 +38,7 @@
#include <fstream>
namespace {
std::string _loggerCat = "RenderableFieldlines";
const char* _loggerCat = "RenderableFieldlines";
const float defaultFieldlineStepSize = 0.5f;;
const glm::vec4 defaultFieldlineColor = glm::vec4(1.f, 0.f, 0.f, 1.f);
@@ -70,7 +70,7 @@ namespace {
const int SeedPointSourceFile = 0;
const int SeedPointSourceTable = 1;
}
} // namespace
namespace openspace {

11
modules/fieldlines/rendering/renderablefieldlines.h
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -35,14 +35,11 @@
#include <ghoul/misc/dictionary.h>
#include <ghoul/opengl/ghoul_gl.h>
namespace ghoul {
namespace opengl {
class ProgramObject;
}
}
namespace ghoul::opengl { class ProgramObject; }
namespace openspace {
struct LinePoint;
struct LinePoint;
class RenderableFieldlines : public Renderable {
public: