More work on making use of nested namespaces

This commit is contained in:
Alexander Bock
2017-07-16 01:55:35 -04:00
parent 4dba552fd1
commit 26682669ff
160 changed files with 726 additions and 908 deletions

View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -66,21 +66,21 @@
namespace {
const std::string _loggerCat = "RenderableMultiresVolume";
const std::string KeyDataSource = "Source";
const std::string KeyErrorHistogramsSource = "ErrorHistogramsSource";
const std::string KeyHints = "Hints";
const std::string KeyTransferFunction = "TransferFunction";
const char* _loggerCat = "RenderableMultiresVolume";
const char* KeyDataSource = "Source";
const char* KeyErrorHistogramsSource = "ErrorHistogramsSource";
const char* KeyHints = "Hints";
const char* KeyTransferFunction = "TransferFunction";
const std::string KeyVolumeName = "VolumeName";
const std::string KeyBrickSelector = "BrickSelector";
const std::string KeyStartTime = "StartTime";
const std::string KeyEndTime = "EndTime";
const std::string GlslHelpersPath = "${MODULES}/multiresvolume/shaders/helpers_fs.glsl";
const std::string GlslHelperPath = "${MODULES}/multiresvolume/shaders/helper.glsl";
const std::string GlslHeaderPath = "${MODULES}/multiresvolume/shaders/header.glsl";
const char* KeyVolumeName = "VolumeName";
const char* KeyBrickSelector = "BrickSelector";
const char* KeyStartTime = "StartTime";
const char* KeyEndTime = "EndTime";
const char* GlslHelpersPath = "${MODULES}/multiresvolume/shaders/helpers_fs.glsl";
const char* GlslHelperPath = "${MODULES}/multiresvolume/shaders/helper.glsl";
const char* GlslHeaderPath = "${MODULES}/multiresvolume/shaders/header.glsl";
bool registeredGlslHelpers = false;
}
} // namespace
namespace openspace {