Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

This commit is contained in:
Emil Axelsson
2017-12-17 18:30:00 +01:00
210 changed files with 5201 additions and 1299 deletions

View File

@@ -42,11 +42,11 @@
#include <fstream>
namespace {
const char* _loggerCat = "NavigationHandler";
constexpr const char* _loggerCat = "NavigationHandler";
const char* KeyFocus = "Focus";
const char* KeyPosition = "Position";
const char* KeyRotation = "Rotation";
constexpr const char* KeyFocus = "Focus";
constexpr const char* KeyPosition = "Position";
constexpr const char* KeyRotation = "Rotation";
static const openspace::properties::Property::PropertyInfo OriginInfo = {
"Origin",