Merge branch 'master' into feature/multiresvolume

* master: (44 commits)
  Remove style guide errors Add missing newline errors
  Update the Sun glare reference
  Update OpenSpace version
  Minor spelling, grammar, & comment cleanup
  Cleanup of gitignore file Started work on fixing Rosetta
  Jenkins compile fix
  Touch module capitalization compile fix
  Fix capitalization of includes
  More shader cleanup Remove dedicated logs folder Change openspaceengine to create logs folder automatically
  Renaming touch include files
  Jenkins compile fix
  Cleanup of shader code
  Jenkins compile fix
  Jenkins compile error
  Jenkins compile fix Remove fresh recompile
  Update Jenkinsfile to clean workspace
  Cleanup copyright information in shaders
  Second part of turning touch classes to lower case
  First step of turning touch classes into lower case
  Replacing void Renderable::render(const RenderData&) with Renderable::render(const RenderData&, RendererTasks&)
  ...

# Conflicts:
#	modules/multiresvolume/rendering/localtfbrickselector.cpp
#	modules/multiresvolume/rendering/localtfbrickselector.h
#	modules/multiresvolume/rendering/renderablemultiresvolume.cpp
#	modules/multiresvolume/rendering/renderablemultiresvolume.h
#	modules/multiresvolume/rendering/shenbrickselector.h
#	modules/multiresvolume/rendering/simpletfbrickselector.cpp
#	modules/multiresvolume/rendering/simpletfbrickselector.h
#	modules/multiresvolume/rendering/tfbrickselector.cpp
#	modules/multiresvolume/rendering/tfbrickselector.h
#	modules/multiresvolume/rendering/tsp.cpp
#	src/performance/performancemanager.cpp

.gitignore

@@ -1,17 +1,17 @@
-*~
-*.swp
 .DS_Store
 .vscode
 /bin/
 /build/
 /cache/
-Thumbs.db
-tmp/
-
-/documentation
 /doc
+/documentation
 /ext/SGCT
+/logs
+tmp/
+Thumbs.db
 
+*~
+*.swp
 *.gglsl
 *.GhoulGenerated.glsl
 *.OpenSpaceGenerated.glsl
@@ -30,7 +30,6 @@ install_manifest.txt
 .project
 
 shaders/ABuffer/constants.hglsl
-log.html
 ScriptLog.txt
 
 data/scene/atmosphereearth/textures
@@ -118,4 +117,4 @@ data/spice/nh_kernels
 data/spice/OsirisRexKernels
 data/spice/plu055.bsp
 data/spice/Rosetta
-data/spice/sat375.bsp
+data/spice/sat375.bsp

CMakeLists.txt

@@ -28,9 +28,9 @@ project (OpenSpace)
 message(STATUS "Generating OpenSpace project")
 
 set(OPENSPACE_VERSION_MAJOR 0)
-set(OPENSPACE_VERSION_MINOR 8)
+set(OPENSPACE_VERSION_MINOR 9)
 set(OPENSPACE_VERSION_PATCH 0)
-set(OPENSPACE_VERSION_STRING "prerelease-13 (Earth Day)")
+set(OPENSPACE_VERSION_STRING "prerelease-14 (Astronomy Live)")
 
 set(OPENSPACE_BASE_DIR "${PROJECT_SOURCE_DIR}")
 set(OPENSPACE_APPS_DIR "${OPENSPACE_BASE_DIR}/apps")

apps/Launcher/CMakeLists.txt

@@ -29,7 +29,8 @@ if (WIN32)
     set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/Launcher/openspace.rc)
 endif ()
 
-include (${GHOUL_BASE_DIR}/support/cmake/handle_external_library.cmake)
+include(${GHOUL_BASE_DIR}/support/cmake/handle_external_library.cmake)
+include(${OPENSPACE_CMAKE_EXT_DIR}/support_macros.cmake)
 
 set(application_path ${OPENSPACE_APPS_DIR}/Launcher)
 
@@ -65,6 +66,8 @@ add_executable(${APPLICATION_NAME} MACOSX_BUNDLE
     ${RESOURCE_FILES}
 )
 
+set_compile_settings(${APPLICATION_NAME})
+
 target_link_libraries(${APPLICATION_NAME}
     Qt5::Widgets
     Qt5::Network

apps/OpenSpace/CMakeLists.txt

@@ -23,6 +23,7 @@
 ##########################################################################################
 
 include(${GHOUL_BASE_DIR}/support/cmake/CopySharedLibraries.cmake) 
+include(${OPENSPACE_CMAKE_EXT_DIR}/support_macros.cmake)
 
 set(APPLICATION_NAME OpenSpace)
 set(APPLICATION_LINK_TO_OPENSPACE ON)
@@ -130,3 +131,5 @@ if (MSVC)
         "/NODEFAULTLIB:LIBCMTD.lib /NODEFAULTLIB:LIBCMT.lib"
     )
 endif()
+
+set_compile_settings(${APPLICATION_NAME})

apps/TaskRunner/CMakeLists.txt

@@ -26,6 +26,7 @@ set(APPLICATION_NAME TaskRunner)
 set(APPLICATION_LINK_TO_OPENSPACE ON)
 
 include (${GHOUL_BASE_DIR}/support/cmake/handle_external_library.cmake)
+include(${OPENSPACE_CMAKE_EXT_DIR}/support_macros.cmake)
 
 set(application_path ${OPENSPACE_APPS_DIR}/TaskRunner)
 
@@ -37,3 +38,4 @@ add_executable(${APPLICATION_NAME} MACOSX_BUNDLE
     ${SOURCE_FILES}
 )
 
+set_compile_settings(${APPLICATION_NAME})

data/scene/missions/newhorizons/jupiter/callisto/callisto.mod

@@ -1,3 +1,5 @@
+local callisto_radius = 1.8213E6
+
 return {
     -- Callisto module
     {   
@@ -7,9 +9,10 @@ return {
             Type = "RenderablePlanetProjection",
             Frame = "IAU_CALLISTO",
             Body = "CALLISTO",
+            Radius = callisto_radius,
             Geometry = {
                 Type = "SimpleSphere",
-                Radius = 1.8213E6,
+                Radius = callisto_radius,
                 Segments = 100
             },
             Textures = {

data/scene/missions/newhorizons/jupiter/europa/europa.mod

@@ -1,3 +1,5 @@
+local europa_radius = 1.8213E6
+
 return {
     -- Europa module
     {   
@@ -7,9 +9,10 @@ return {
             Type = "RenderablePlanetProjection",
             Frame = "IAU_EUROPA", 
             Body = "EUROPA",
+            Radius = europa_radius,
             Geometry = {
                 Type = "SimpleSphere",
-                Radius = 1.8213E6,
+                Radius = europa_radius,
                 Segments = 100
             },
             Textures = {

data/scene/missions/newhorizons/jupiter/ganymede/ganymede.mod

@@ -1,3 +1,5 @@
+local ganymede_local = 1.8213E6
+
 return {
     -- Ganymede module
     {   
@@ -7,9 +9,10 @@ return {
             Type = "RenderablePlanetProjection",
             Frame = "IAU_GANYMEDE", 
             Body = "GANYMEDE",
+            Radius = ganymede_local,
             Geometry = {
                 Type = "SimpleSphere",
-                Radius = 1.8213E6,
+                Radius = ganymede_local,
                 Segments = 100
             },
             Textures = {

data/scene/missions/newhorizons/jupiter/io/io.mod

@@ -1,3 +1,5 @@
+local io_radius = 1.8213E6
+
 return {
     -- Io module
     {   
@@ -7,9 +9,10 @@ return {
             Type = "RenderablePlanetProjection",
             Frame = "IAU_IO", 
             Body = "IO",
+            Radius = io_radius,
             Geometry = {
                 Type = "SimpleSphere",
-                Radius = 1.8213E6,
+                Radius = io_radius,
                 Segments = 100
             },
             Textures = {
@@ -74,7 +77,7 @@ return {
         Parent = "Io",
         Renderable = {
             Type = "RenderablePlane",
-            Size = {1.0, 7.4},
+            Size = 10^7.4,
             Origin = "Center",
             Billboard = true,
             Texture = "textures/Io-Text.png",

data/scene/missions/newhorizons/jupiter/jupiter/jupiter.mod

@@ -1,3 +1,5 @@
+local jupiter_local = 0.71492E8
+
 return {
     -- Jupiter barycenter module
     {
@@ -20,9 +22,10 @@ return {
             Type = "RenderablePlanetProjection",
             Frame = "IAU_JUPITER",
             Body = "JUPITER",
+            Radius = jupiter_local,
             Geometry = {
                 Type = "SimpleSphere",
-                Radius = 0.71492E8,
+                Radius = jupiter_local,
                 Segments = 200,
             },
             Textures = {

data/scene/missions/newhorizons/newhorizons/newhorizons.mod

@@ -1,46 +1,36 @@
 if UseAccurateNewHorizonsKernels then
     NewHorizonsKernels = {
-        -- SCLK
-        "${SPICE}/nh_kernels/sclk/new-horizons_0976.tsc",
-        -- "${SPICE}/NewHorizonsKernels/new_horizons_413.tsc",
+        "${SPICE}/nh_20170126/spk/nh_pred_20141201_20190301_od122.bsp",
+        "${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp",
+        "${SPICE}/nh_20170126/spk/NavPE_de433_od122.bsp",
 
-        -- SPK
-        "${SPICE}/nh_kernels/spk/nh_pred_20141201_20190301_od122.bsp",
-        -- "${SPICE}/nh_kernels/spk/nh_pred_20120501_20160913_od093.bsp",
-        "${SPICE}/nh_kernels/spk/plu_all_mvi.spk",
         "${SPICE}/jup260.bsp",
-        -- "${SPICE}/NewHorizonsKernels/de413.bsp",
 
-        -- CK
-        "${SPICE}/nh_kernels/ck/nh_scispi_2015_pred.bc",
-        "${SPICE}/nh_kernels/ck/nh_scispi_2015_recon.bc",
-        "${SPICE}/nh_kernels/ck/nh_lorri_wcs.bc",
-        "${SPICE}/nh_kernels/ck/plutonet_PS104.bc",
+        "${SPICE}/nh_20170126/ck/nh_scispi_2015_pred.bc",
+        "${SPICE}/nh_20170126/ck/nh_scispi_2015_recon.bc",
+        "${SPICE}/nh_20170126/ck/nh_lorri_wcs.bc",
+        
+        "${SPICE}/nh_20170126/smithed_pc_and_sp/PLU_LORRI_ALL_161216.bc",
 
-        -- FK
-        "${SPICE}/nh_kernels/fk/nh_soc_misc_v001.tf",
-        "${SPICE}/nh_kernels/fk/nh_v220.tf",
+        "${SPICE}/nh_20170126/sclk/new-horizons_1121.tsc",
 
-        -- IK
-        "${SPICE}/nh_kernels/ik/nh_alice_v120.ti",
-        "${SPICE}/nh_kernels/ik/nh_allinstruments_v002.ti",
-        "${SPICE}/nh_kernels/ik/nh_astr_v000.ti",
-        "${SPICE}/nh_kernels/ik/nh_fss_v000.ti",
-        "${SPICE}/nh_kernels/ik/nh_lorri_v100.ti",
-        "${SPICE}/nh_kernels/ik/nh_pepssi_v110.ti",
-        "${SPICE}/nh_kernels/ik/nh_ralph_v100.ti",
-        "${SPICE}/nh_kernels/ik/nh_rex_v100.ti",
-        "${SPICE}/nh_kernels/ik/nh_sdc_v101.ti",
-        "${SPICE}/nh_kernels/ik/nh_swap_v100.ti",
+        "${SPICE}/nh_20170126/pck/nh_targets_v001.tpc",
+        "${SPICE}/nh_20170126/pck/nh_pcnh_005.tpc",
 
-        -- LSK
-        "${SPICE}/nh_kernels/lsk/naif0011.tls",
-
-        -- PCK
-        "${SPICE}/nh_kernels/pck/nh_targets_v001.tpc",
-        "${SPICE}/nh_kernels/pck/pck00010.tpc",
-        "${SPICE}/nh_kernels/pck/nh_pcnh_002.tpc"
-    };
+        "${SPICE}/nh_20170126/fk/nh_v220.tf",
+        "${SPICE}/nh_20170126/ik/nh_allinstruments_v002.ti",
+        "${SPICE}/nh_20170126/ik/nh_alice_v200.ti",
+        "${SPICE}/nh_20170126/ik/nh_lorri_v201.ti",
+        "${SPICE}/nh_20170126/ik/nh_pepssi_v110.ti",
+        "${SPICE}/nh_20170126/ik/nh_ralph_v100.ti",
+        "${SPICE}/nh_20170126/ik/nh_rex_v100.ti",
+        "${SPICE}/nh_20170126/ik/nh_sdc_v101.ti",
+        "${SPICE}/nh_20170126/ik/nh_swap_v100.ti",
+        "${SPICE}/nh_20170126/ik/nh_astr_v000.ti",
+        "${SPICE}/nh_20170126/ik/nh_fss_v000.ti",
+        "${SPICE}/nh_20170126/fk/nh_soc_misc_v001.tf",
+        "${SPICE}/nh_20170126/spk/nh_stars.bsp",
+    }
 else
     NewHorizonsKernels = {
         --SCLK
@@ -118,12 +108,6 @@ return {
                 Ghosting = false,
             },
         },
-        Transform = {
-            Scale = {
-                Type = "StaticScale",
-                Scale = 100
-            }
-        },
     },
     --NewHorizonsTrail module
     --[[{   

data/scene/missions/newhorizons/newhorizonsfov/newhorizonsfov.mod

@@ -1,22 +1,21 @@
+local LorriOffset = { -6.626, -4.1, -3.23 }
+local RalphOffset = {   -6.9, -4.6,  8.7  }
+local AliceOffset = {   -7.9, -1.7,  8.3  }
+local RexOffset   = {      0,    0,    0  }
+
 return {
     -- NewHorizonsFov main module
-    {   
+    {
         Name = "NH_LORRI",
         Parent = "NewHorizonsPosition",
         Renderable = {
             Type  = "RenderableFov",
             Body  = "NEW HORIZONS",
             Frame = "NH_SPACECRAFT",
-            RGB   = { 0.8, 0.7, 0.7 },
-            Textures = {
-                Type  = "simple",
-                Color = "textures/glare_blue.png",
-                -- need to add different texture
-            },
-            Instrument = {                
+            Color = { 0.8, 0.7, 0.7 },
+            Instrument = {
                 Name       = "NH_LORRI",
-                Method     = "ELLIPSOID",
-                Aberration = "NONE",      
+                Aberration = "NONE"
             },
             PotentialTargets = {
                 "Pluto",
@@ -24,281 +23,311 @@ return {
                 "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
             }
         },
+        Transform = {
+            Translation = {
+                Type = "StaticTranslation",
+                Position = LorriOffset
+            }
+        }
     },
+
     -- NewHorizonsFov module NH_RALPH_LEISA
-    {   
-        Name = "NH_RALPH_LEISA",
-        Parent = "NewHorizonsPosition",
-        Renderable = {
-            Type  = "RenderableFov",
-            Body  = "NEW HORIZONS",
-            Frame = "NH_SPACECRAFT",
-            RGB   = { 0.8, 0.7, 0.7 },
-            Textures = {
-                Type  = "simple",
-                Color = "textures/glare_blue.png",
-                -- need to add different texture
-            },
-            Instrument = {               
-                Name       = "NH_RALPH_LEISA",
-                Method     = "ELLIPSOID",
-                Aberration = "NONE",     
-            },
-            PotentialTargets = {
-                "Pluto",
-                "Charon",
-                "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
-            }
+{
+    Name = "NH_RALPH_LEISA",
+    Parent = "NewHorizonsPosition",
+    Renderable = {
+        Type  = "RenderableFov",
+        Body  = "NEW HORIZONS",
+        Frame = "NH_SPACECRAFT",
+        RGB   = { 0.8, 0.7, 0.7 },
+        Instrument = {
+            Name       = "NH_RALPH_LEISA",
+            Aberration = "NONE"
         },
+        PotentialTargets = {
+            "Pluto",
+            "Charon",
+            "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
+        }
     },
+    Transform = {
+        Translation = {
+            Type = "StaticTranslation",
+            Position = RalphOffset
+        }
+    }
+},
 
-    -- NewHorizonsFov module NH_RALPH_MVIC_PAN1
-    {   
-        Name = "NH_RALPH_MVIC_PAN1",
-        Parent = "NewHorizonsPosition",
-        Renderable = {
-            Type  = "RenderableFov",
-            Body  = "NEW HORIZONS",
-            Frame = "NH_SPACECRAFT",
-            RGB   = { 0.8, 0.7, 0.7 },
-            Textures = {
-                Type  = "simple",
-                Color = "textures/glare_blue.png",
-                -- need to add different texture
-            },
-            Instrument = {               
-                Name       = "NH_RALPH_MVIC_PAN1",
-                Method     = "ELLIPSOID",
-                Aberration = "NONE",     
-            },
-            PotentialTargets = {
-                "Pluto",
-                "Charon",
-                "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
-            }
+-- NewHorizonsFov module NH_RALPH_MVIC_PAN1
+{
+    Name = "NH_RALPH_MVIC_PAN1",
+    Parent = "NewHorizonsPosition",
+    Renderable = {
+        Type  = "RenderableFov",
+        Body  = "NEW HORIZONS",
+        Frame = "NH_SPACECRAFT",
+        RGB   = { 0.8, 0.7, 0.7 },
+        Instrument = {
+            Name       = "NH_RALPH_MVIC_PAN1",
+            Aberration = "NONE"
         },
+        PotentialTargets = {
+            "Pluto",
+            "Charon",
+            "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
+        }
     },
-    -- NewHorizonsFov module NH_RALPH_MVIC_PAN2
-    {   
-        Name = "NH_RALPH_MVIC_PAN2",
-        Parent = "NewHorizonsPosition",
-        Renderable = {
-            Type  = "RenderableFov",
-            Body  = "NEW HORIZONS",
-            Frame = "NH_SPACECRAFT",
-            RGB   = { 0.8, 0.7, 0.7 },
-            Textures = {
-                Type  = "simple",
-                Color = "textures/glare_blue.png",
-                -- need to add different texture
-            },
-            Instrument = {               
-                Name       = "NH_RALPH_MVIC_PAN2",
-                Method     = "ELLIPSOID",
-                Aberration = "NONE",      
-            },
-            PotentialTargets = {
-                "Pluto",
-                "Charon",
-                "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
-            }
+    Transform = {
+        Translation = {
+            Type = "StaticTranslation",
+            Position = RalphOffset
+        }
+    }
+},
 
+-- NewHorizonsFov module NH_RALPH_MVIC_PAN2
+{
+    Name = "NH_RALPH_MVIC_PAN2",
+    Parent = "NewHorizonsPosition",
+    Renderable = {
+        Type  = "RenderableFov",
+        Body  = "NEW HORIZONS",
+        Frame = "NH_SPACECRAFT",
+        RGB   = { 0.8, 0.7, 0.7 },
+        Instrument = {
+            Name       = "NH_RALPH_MVIC_PAN2",
+            Aberration = "NONE"
         },
+        PotentialTargets = {
+            "Pluto",
+            "Charon",
+            "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
+        }
     },
-    -- NewHorizonsFov module NH_RALPH_MVIC_RED
-    {   
-        Name = "NH_RALPH_MVIC_RED",
-        Parent = "NewHorizonsPosition",
-        Renderable = {
-            Type  = "RenderableFov",
-            Body  = "NEW HORIZONS",
-            Frame = "NH_SPACECRAFT",
-            RGB   = { 0.8, 0.7, 0.7 },
-            Textures = {
-                Type  = "simple",
-                Color = "textures/glare_blue.png",
-                -- need to add different texture
-            },
-            Instrument = {               
-                Name       = "NH_RALPH_MVIC_RED",
-                Method     = "ELLIPSOID",
-                Aberration = "NONE",      
-            },
-            PotentialTargets = {
-                "Pluto",
-                "Charon",
-                "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
-            }
+    Transform = {
+        Translation = {
+            Type = "StaticTranslation",
+            Position = RalphOffset
+        }
+    }
+},
 
+-- NewHorizonsFov module NH_RALPH_MVIC_RED
+{
+    Name = "NH_RALPH_MVIC_RED",
+    Parent = "NewHorizonsPosition",
+    Renderable = {
+        Type  = "RenderableFov",
+        Body  = "NEW HORIZONS",
+        Frame = "NH_SPACECRAFT",
+        RGB   = { 0.8, 0.7, 0.7 },
+        Instrument = {
+            Name       = "NH_RALPH_MVIC_RED",
+            Aberration = "NONE"
         },
+        PotentialTargets = {
+            "Pluto",
+            "Charon",
+            "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
+        }
     },
-    -- NewHorizonsFov module NH_RALPH_MVIC_BLUE
-    {   
-        Name = "NH_RALPH_MVIC_BLUE",
-        Parent = "NewHorizonsPosition",
-        Renderable = {
-            Type  = "RenderableFov",
-            Body  = "NEW HORIZONS",
-            Frame = "NH_SPACECRAFT",
-            RGB   = { 0.8, 0.7, 0.7 },
-            Textures = {
-                Type  = "simple",
-                Color = "textures/glare_blue.png",
-                -- need to add different texture
-            },
-            Instrument = {               
-                Name       = "NH_RALPH_MVIC_BLUE",
-                Method     = "ELLIPSOID",
-                Aberration = "NONE",     
-            },
-            PotentialTargets = {
-                "Pluto",
-                "Charon",
-                "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
-            }
+    Transform = {
+        Translation = {
+            Type = "StaticTranslation",
+            Position = RalphOffset
+        }
+    }
+},
+
+ -- NewHorizonsFov module NH_RALPH_MVIC_BLUE
+ {
+    Name = "NH_RALPH_MVIC_BLUE",
+    Parent = "NewHorizonsPosition",
+    Renderable = {
+        Type  = "RenderableFov",
+        Body  = "NEW HORIZONS",
+        Frame = "NH_SPACECRAFT",
+        RGB   = { 0.8, 0.7, 0.7 },
+        Instrument = {
+            Name       = "NH_RALPH_MVIC_BLUE",
+            Aberration = "NONE"
         },
+        PotentialTargets = {
+            "Pluto",
+            "Charon",
+            "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
+        }
     },
-    -- NewHorizonsFov module NH_RALPH_MVIC_FT
-    {   
-        Name = "NH_RALPH_MVIC_FT",
-        Parent = "NewHorizonsPosition",
-        Renderable = {
-            Type  = "RenderableFov",
-            Body  = "NEW HORIZONS",
-            Frame = "NH_SPACECRAFT",
-            RGB   = { 0.8, 0.7, 0.7 },
-            Textures = {
-                Type  = "simple",
-                Color = "textures/glare_blue.png",
-                -- need to add different texture
-            },
-            Instrument = {                
-                Name       = "NH_RALPH_MVIC_FT",
-                Method     = "ELLIPSOID",
-                Aberration = "NONE",     
-            },
-            PotentialTargets = {
-                "Pluto",
-                "Charon",
-                "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
-            }
+    Transform = {
+        Translation = {
+            Type = "StaticTranslation",
+            Position = RalphOffset
+        }
+    }
+},
+
+-- NewHorizonsFov module NH_RALPH_MVIC_FT
+{
+    Name = "NH_RALPH_MVIC_FT",
+    Parent = "NewHorizonsPosition",
+    Renderable = {
+        Type  = "RenderableFov",
+        Body  = "NEW HORIZONS",
+        Frame = "NH_SPACECRAFT",
+        RGB   = { 0.8, 0.7, 0.7 },
+        Instrument = {
+            Name       = "NH_RALPH_MVIC_FT",
+            Aberration = "NONE"
         },
+        PotentialTargets = {
+            "Pluto",
+            "Charon",
+            "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
+        }
     },
-    -- NewHorizonsFov module NH_RALPH_MVIC_METHANE
-    {   
-        Name = "NH_RALPH_MVIC_METHANE",
-        Parent = "NewHorizonsPosition",
-        Renderable = {
-            Type  = "RenderableFov",
-            Body  = "NEW HORIZONS",
-            Frame = "NH_SPACECRAFT",
-            RGB   = { 0.8, 0.7, 0.7 },
-            Textures = {
-                Type  = "simple",
-                Color = "textures/glare_blue.png",
-                -- need to add different texture
-            },
-            Instrument = {                
-                Name       = "NH_RALPH_MVIC_METHANE",
-                Method     = "ELLIPSOID",
-                Aberration = "NONE",      
-            },
-            PotentialTargets = {
-                "Pluto",
-                "Charon",
-                "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
-            }
+    Transform = {
+        Translation = {
+            Type = "StaticTranslation",
+            Position = RalphOffset
+        }
+    }
+},
+
+-- NewHorizonsFov module NH_RALPH_MVIC_METHANE
+{
+    Name = "NH_RALPH_MVIC_METHANE",
+    Parent = "NewHorizonsPosition",
+    Renderable = {
+        Type  = "RenderableFov",
+        Body  = "NEW HORIZONS",
+        Frame = "NH_SPACECRAFT",
+        RGB   = { 0.8, 0.7, 0.7 },
+        Instrument = {
+            Name       = "NH_RALPH_MVIC_METHANE",
+            Aberration = "NONE"
         },
+        PotentialTargets = {
+            "Pluto",
+            "Charon",
+            "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
+        }
     },
-    -- NewHorizonsFov module NH_RALPH_MVIC_NIR
-    {   
-        Name = "NH_RALPH_MVIC_NIR",
-        Parent = "NewHorizonsPosition",
-        Renderable = {
-            Type  = "RenderableFov",
-            Body  = "NEW HORIZONS",
-            Frame = "NH_SPACECRAFT",
-            RGB   = { 0.8, 0.7, 0.7 },
-            Textures = {
-                Type  = "simple",
-                Color = "textures/glare_blue.png",
-                -- need to add different texture
-            },
-            Instrument = {                
-                Name       = "NH_RALPH_MVIC_NIR",
-                Method     = "ELLIPSOID",
-                Aberration = "NONE",      
-            },
-            PotentialTargets = {
-                "Pluto",
-                "Charon",
-                "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
-            }
+    Transform = {
+        Translation = {
+            Type = "StaticTranslation",
+            Position = RalphOffset
+        }
+    }
+},
+
+-- NewHorizonsFov module NH_RALPH_MVIC_NIR
+{
+    Name = "NH_RALPH_MVIC_NIR",
+    Parent = "NewHorizonsPosition",
+    Renderable = {
+        Type  = "RenderableFov",
+        Body  = "NEW HORIZONS",
+        Frame = "NH_SPACECRAFT",
+        RGB   = { 0.8, 0.7, 0.7 },
+        Instrument = {
+            Name       = "NH_RALPH_MVIC_NIR",
+            Aberration = "NONE"
         },
+        PotentialTargets = {
+            "Pluto",
+            "Charon",
+            "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
+        }
     },
-    -- NewHorizonsFov module NH_ALICE_AIRGLOW
-    {   
-        Name = "NH_ALICE_AIRGLOW",
-        Parent = "NewHorizonsPosition",
-        Renderable = {
-            Type  = "RenderableFov",
-            Body  = "NEW HORIZONS",
-            Frame = "NH_SPACECRAFT",
-            RGB   = { 0.8, 0.7, 0.7 },
-            Textures = {
-                Type  = "simple",
-                Color = "textures/glare_blue.png",
-                -- need to add different texture
-            },
-            Instrument = {                
-                Name       = "NH_ALICE_AIRGLOW",
-                Method     = "ELLIPSOID",
-                Aberration = "NONE",      
-            },
-            PotentialTargets = {
-                "Pluto",
-                "Charon",
-                "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
-            }
+    Transform = {
+        Translation = {
+            Type = "StaticTranslation",
+            Position = RalphOffset
+        }
+    }
+},
+
+-- NewHorizonsFov module NH_ALICE_AIRGLOW
+{
+    Name = "NH_ALICE_AIRGLOW",
+    Parent = "NewHorizonsPosition",
+    Renderable = {
+        Type  = "RenderableFov",
+        Body  = "NEW HORIZONS",
+        Frame = "NH_SPACECRAFT",
+        RGB   = { 0.8, 0.7, 0.7 },
+        Instrument = {
+            Name       = "NH_ALICE_AIRGLOW",
+            Aberration = "NONE"
         },
+        PotentialTargets = {
+            "Pluto",
+            "Charon",
+            "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
+        }
     },
-    -- NewHorizonsFov module NH_ALICE_SOC
-    {   
-        Name = "NH_ALICE_SOC",
-        Parent = "NewHorizonsPosition",
-        Renderable = {
-            Type  = "RenderableFov",
-            Body  = "NEW HORIZONS",
-            Frame = "NH_SPACECRAFT",
-            RGB   = { 0.8, 0.7, 0.7 },
-            Textures = {
-                Type  = "simple",
-                Color = "textures/glare_blue.png",
-                -- need to add different texture
-            },
-            Instrument = {                
-                Name       = "NH_ALICE_SOC",
-                Method     = "ELLIPSOID",
-                Aberration = "NONE",      
-            },
-            PotentialTargets = {
-                "Pluto",
-                "Charon",
-                "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
-            }
+    Transform = {
+        Translation = {
+            Type = "StaticTranslation",
+            Position = AliceOffset
+        }
+    }
+},
+
+-- NewHorizonsFov module NH_ALICE_SOC
+{
+    Name = "NH_ALICE_SOC",
+    Parent = "NewHorizonsPosition",
+    Renderable = {
+        Type  = "RenderableFov",
+        Body  = "NEW HORIZONS",
+        Frame = "NH_SPACECRAFT",
+        RGB   = { 0.8, 0.7, 0.7 },
+        Instrument = {
+            Name       = "NH_ALICE_SOC",
+            Aberration = "NONE"
         },
+        PotentialTargets = {
+            "Pluto",
+            "Charon",
+            "Jupiter", "Io", "Europa", "Ganymede", "Callisto"
+        }
     },
-    {
-        Name = "NH_REX",
-        Parent = "NewHorizonsPosition",
-        Renderable = {
-            Type  = "RenderableCrawlingLine",
-            Source = "NH_REX",
-            Target = "EARTH",
-            -- Body = "NEW HORIZONS",
-            Frame = "GALACTIC",
-            Color = { 1.0, 0.7, 0.0 },
-            Instrument = "NH_REX"
+    Transform = {
+        Translation = {
+            Type = "StaticTranslation",
+            Position = AliceOffset
         },
     }
-}
+ },
+
+-- Module NH_REX
+{
+    Name = "NH_REX",
+    Parent = "NewHorizonsPosition",
+    Renderable = {
+        Type  = "RenderableCrawlingLine",
+        Source = "NH_REX",
+        Target = "EARTH",
+        Instrument = "NH_REX",
+        Color = {
+            Start = { 1.0, 0.7, 0.0, 1.0},
+            End = {0.0, 0.0, 0.0, 0.0 }
+        }
+    },
+    Transform = {
+        Rotation = {
+            Type = "StaticRotation",
+            Rotation = {
+                0.0, 1.0, 0.0,
+                0.0, 0.0, 1.0,
+                1.0, 0.0, 0.0
+            }
+        },
+        Translation = {
+            Type = "StaticTranslation",
+            Position = RexOffset
+        }
+    }
+}
+}

data/scene/missions/newhorizons/pluto/charon/charon.mod

@@ -1,6 +1,9 @@
+local charon_radius = 6.035E5
+
 if UseAccurateNewHorizonsKernels then
     NewHorizonsKernels = {
-        "${SPICE}/nh_kernels/spk/NavSE_plu047_od122.bsp"
+        "${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp",
+        "${SPICE}/nh_20170126/spk/NavPE_de433_od122.bsp",
     }
 else
     NewHorizonsKernels = {
@@ -8,12 +11,12 @@ else
     }
 end
 
-Files = {
+local Files = {
     low = "textures/charon_highres.jpg",
     med = "textures/charon_highres.jpg",
     high = "textures/cpmap_cyl_HR_0e.jpg"
 }
-ColorTexture = Files[TextureResolution]
+local ColorTexture = Files[TextureResolution]
 
 return {
     -- CharonProjection module
@@ -22,9 +25,10 @@ return {
         Parent = "PlutoBarycenter",
         Renderable = {
             Type = "RenderablePlanetProjection",
+            Radius = charon_radius,
             Geometry = {
                 Type = "SimpleSphere",
-                Radius = 6.035E5,
+                Radius = charon_radius,
                 Segments = 100
             },
             Textures = {

data/scene/missions/newhorizons/pluto/hydra/hydra.mod

@@ -1,6 +1,8 @@
+local charon_radius = 0.53E5
+
 if UseAccurateNewHorizonsKernels then
     NewHorizonsKernels = {
-        "${SPICE}/nh_kernels/spk/NavSE_plu047_od122.bsp"
+        "${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp"
     }
 else
     NewHorizonsKernels = {
@@ -17,9 +19,10 @@ return {
             Type = "RenderablePlanet",
             Frame = "IAU_PLUTO",
             Body = "HYDRA",
+            Radius = charon_radius,
             Geometry = {
                 Type = "SimpleSphere",
-                Radius = { 0.53 , 5 },
+                Radius = charon_radius,
                 Segments = 100
             },
             Textures = {

data/scene/missions/newhorizons/pluto/kerberos/kerberos.mod

@@ -1,6 +1,8 @@
+local kerberos_radius = 0.1E5
+
 if UseAccurateNewHorizonsKernels then
     NewHorizonsKernels = {
-        "${SPICE}/nh_kernels/spk/NavSE_plu047_od122.bsp"
+        "${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp"
     }
 else
     NewHorizonsKernels = {
@@ -17,9 +19,10 @@ return {
             Type = "RenderablePlanet",
             Frame = "IAU_PLUTO",
             Body = "KERBEROS",
+            Radius = kerberos_radius,
             Geometry = {
                 Type = "SimpleSphere",
-                Radius = { 0.1 , 5 },
+                Radius = kerberos_radius,
                 Segments = 100
             },
             Textures = {

data/scene/missions/newhorizons/pluto/nix/nix.mod

@@ -1,6 +1,8 @@
+local nix_radius = 0.45E5
+
 if UseAccurateNewHorizonsKernels then
     NewHorizonsKernels = {
-        "${SPICE}/nh_kernels/spk/NavSE_plu047_od122.bsp"
+        "${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp"
     }
 else
     NewHorizonsKernels = {
@@ -17,9 +19,10 @@ return {
             Type = "RenderablePlanet",
             Frame = "IAU_PLUTO",
             Body = "NIX",
+            Radius = nix_radius,
             Geometry = {
                 Type = "SimpleSphere",
-                Radius = 0.45E5,
+                Radius = nix_radius,
                 Segments = 100
             },
             Textures = {

data/scene/missions/newhorizons/pluto/pluto/pluto.mod

@@ -1,7 +1,9 @@
+local pluto_radius = 1.173E6
+
 if UseAccurateNewHorizonsKernels then
     NewHorizonsKernels = {
-        "${SPICE}/nh_kernels/spk/NavPE_de433_od122.bsp",
-        "${SPICE}/nh_kernels/spk/NavSE_plu047_od122.bsp"
+        "${SPICE}/nh_20170126/spk/NavPE_de433_od122.bsp",
+        "${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp"
     }
 else
     NewHorizonsKernels = {
@@ -9,12 +11,12 @@ else
     }
 end
 
-Files = {
+local Files = {
     low = "textures/pluto_large.jpg",
     med = "textures/Shenk_180.jpg",
     high = "textures/pmap_cyl_HR_LOR_lowres.jpg"
 }
-ColorTexture = Files[TextureResolution]
+local ColorTexture = Files[TextureResolution]
 
 return {
     -- Pluto barycenter module
@@ -36,9 +38,10 @@ return {
         Parent = "PlutoBarycenter",
         Renderable = {
             Type = "RenderablePlanetProjection",
+            Radius = pluto_radius,
             Geometry = {
                 Type = "SimpleSphere",
-                Radius = 1.173E6,
+                Radius = pluto_radius,
                 Segments = 100
             },
             Textures = {
@@ -205,7 +208,7 @@ return {
         Parent = "Pluto",
         Renderable = {
             Type = "RenderablePlane",
-            Size = {1.0, 6.4},
+            Size = 10.0^6.4,
             Origin = "Center",
             Billboard = true,
             ProjectionListener = false,

data/scene/missions/newhorizons/pluto/styx/styx.mod

@@ -1,6 +1,8 @@
+local styx_radius = 0.75E4
+
 if UseAccurateNewHorizonsKernels then
     NewHorizonsKernels = {
-        "${SPICE}/nh_kernels/spk/NavSE_plu047_od122.bsp"
+        "${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp"
     }
 else
     NewHorizonsKernels = {
@@ -17,9 +19,10 @@ return {
             Type = "RenderablePlanet",
             Frame = "IAU_PLUTO",
             Body = "STYX",
+            Radius = styx_radius,
             Geometry = {
                 Type = "SimpleSphere",
-                Radius = 0.75E4,
+                Radius = styx_radius,
                 Segments = 100
             },
             Textures = {

data/scene/sun/sun.data

@@ -1,5 +1,5 @@
 return {
     FileRequest = {
-        { Identifier = "sun_textures", Destination = "textures", Version = 1 }
+        { Identifier = "sun_textures", Destination = "textures", Version = 3 }
     },
 }

include/openspace/documentation/documentation.h

@@ -34,8 +34,7 @@
 
 namespace ghoul { class Dictionary; }
 
-namespace openspace {
-namespace documentation {
+namespace openspace::documentation {
 
 using Optional = ghoul::Boolean;
 using Exhaustive = ghoul::Boolean;
@@ -303,9 +302,7 @@ TestResult testSpecification(const Documentation& documentation,
 void testSpecificationAndThrow(const Documentation& documentation,
     const ghoul::Dictionary& dictionary, std::string component);
 
-} // namespace documentation
-
-} // namespace openspace
+} // namespace openspace::documentation
 
 // Make the overload for std::to_string available for the Offense::Reason for easier
 // error logging

include/openspace/documentation/documentationengine.h

@@ -31,8 +31,7 @@
 
 #include <ghoul/misc/exception.h>
 
-namespace openspace {
-namespace documentation {
+namespace openspace::documentation {
 
 /**
  * The DocumentationEngine has the ability to collect all Documentation%s that are
@@ -92,8 +91,7 @@ private:
     static DocumentationEngine* _instance;
 };
 
-} // namespace documentation
-} // namespace openspace
+} // namespace openspace::documentation
 
 #define DocEng (openspace::documentation::DocumentationEngine::ref())
 

include/openspace/documentation/documentationgenerator.h

@@ -100,6 +100,15 @@ private:
     const std::string _javascriptFile;
 };
     
+
+/**
+ * This function takes a \p text and escapes all necessary characters () that JSON
+ * does not want in its strings.
+ * \param text The text that is to be escaped
+ * \return The same text will all required characteres escaped
+ */
+std::string escapedJson(const std::string& text);
+
 } // namespace openspace
 
 #endif // __OPENSPACE_CORE___DOCUMENTATIONGENERATOR___H__

include/openspace/documentation/verifier.h

@@ -32,8 +32,7 @@
 #include <functional>
 #include <type_traits>
 
-namespace openspace {
-namespace documentation {
+namespace openspace::documentation {
 
 /**
  * The base class of all Verifier%s. Each object must have an Verifier::operator()
@@ -1153,8 +1152,7 @@ extern template struct DeprecatedVerifier<BoolVector4Verifier>;
 extern template struct DeprecatedVerifier<IntVector4Verifier>;
 extern template struct DeprecatedVerifier<DoubleVector4Verifier>;
 
-} // namespace documentation
-} // namespace openspace
+} // namespace openspace::documentation
 
 #include "verifier.inl"
 

include/openspace/documentation/verifier.inl

@@ -29,10 +29,9 @@
 
 namespace std {
     std::string to_string(std::string value);
-}
+} // namespace std
 
-namespace openspace {
-namespace documentation {
+namespace openspace::documentation {
 
 template <typename T>
 TestResult TemplateVerifier<T>::operator()(const ghoul::Dictionary& dict,
@@ -355,5 +354,4 @@ std::string DeprecatedVerifier<T>::documentation() const {
     return T::documentation() + " (deprecated)";
 }
 
-} // namespace documentation
-} // namespace openspace
+} // namespace openspace::documentation

include/openspace/engine/configurationmanager.h

@@ -1,4 +1,4 @@
-/*****************************************************************************************
+/*****************************************************************************************
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
@@ -28,6 +28,7 @@
 #include <ghoul/misc/dictionary.h>
 
 namespace openspace {
+
 namespace documentation {  struct Documentation; }
 
 /**

include/openspace/engine/logfactory.h

@@ -27,12 +27,8 @@
 
 #include <memory>
 
-namespace ghoul {
-
-class Dictionary;
-namespace logging { class Log; }
-
-} // namespace ghoul
+namespace ghoul { class Dictionary; }
+namespace ghoul::logging { class Log; }
 
 namespace openspace {
 

include/openspace/engine/moduleengine.h

@@ -33,13 +33,7 @@
 #include <ghoul/misc/assert.h>
 #include <algorithm>
 
-namespace ghoul {
-namespace systemcapabilities {
-
-struct Version;
-
-} // namespace systemcapabilities
-} // namespace ghoul
+namespace ghoul::systemcapabilities { struct Version; }
 
 namespace openspace {
 

include/openspace/engine/openspaceengine.h

@@ -35,14 +35,9 @@
 #include <string>
 #include <vector>
 
-namespace ghoul {
-    
-class Dictionary;
-
-namespace cmdparser { class CommandlineParser; }
-namespace fontrendering { class FontManager; }
-
-} // namespace ghoul
+namespace ghoul { class Dictionary; }
+namespace ghoul::cmdparser { class CommandlineParser; }
+namespace ghoul::fontrendering { class FontManager; }
 
 namespace openspace {
 

include/openspace/interaction/controller.h

@@ -30,8 +30,7 @@
 #include <ghoul/glm.h>
 #include <glm/gtx/vector_angle.hpp>
 
-namespace openspace {
-namespace interaction {
+namespace openspace::interaction {
 
 class NavigationHandler;
 
@@ -47,7 +46,6 @@ protected:
     NavigationHandler* _handler;
 };
 
-} // namespace interaction
-} // namespace openspace
+} // namespace openspace::interaction
 
 #endif // __OPENSPACE_CORE___CONTROLLER___H__

include/openspace/interaction/delayedvariable.h

@@ -25,8 +25,7 @@
 #ifndef __OPENSPACE_CORE___DELAYEDVARIABLE___H__
 #define __OPENSPACE_CORE___DELAYEDVARIABLE___H__
 
-namespace openspace {
-namespace interaction {
+namespace openspace::interaction {
 
 /**
  * Class that acts as a smoothing filter to a variable. The filter has a step
@@ -51,8 +50,7 @@ private:
     T _currentValue;
 };
 
-} // namespace interaction
-} // namespace openspace
+} // namespace openspace::interaction
 
 #include "delayedvariable.inl"
 

include/openspace/interaction/delayedvariable.inl

@@ -25,8 +25,7 @@
 #include <ghoul/misc/assert.h>
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace interaction {
+namespace openspace::interaction {
 
 template <typename T, typename ScaleType>
 DelayedVariable<T, ScaleType>::DelayedVariable(ScaleType scaleFactor, ScaleType friction)
@@ -72,5 +71,4 @@ T DelayedVariable<T, ScaleType>::get() const {
     return _currentValue;
 }
 
-} // namespace interaction
-} // namespace openspace
+} // namespace openspace::interaction

include/openspace/interaction/inputstate.h

@@ -28,12 +28,11 @@
 #include <openspace/util/keys.h>
 #include <openspace/util/mouse.h>
 
-#include <glm/glm.hpp>
+#include <ghoul/glm.h>
 
 #include <list>
 
-namespace openspace {
-namespace interaction {
+namespace openspace::interaction {
 
 class InputState {
 public:
@@ -64,7 +63,6 @@ private:
     double _mouseScrollDelta;
 };
 
-} // namespace interaction
-} // namespace openspace
+} // namespace openspace::interaction
 
 #endif // __OPENSPACE_CORE___INPUTSTATE___H__

include/openspace/interaction/interpolator.h

@@ -27,8 +27,7 @@
 
 #include <functional>
 
-namespace openspace {
-namespace interaction {
+namespace openspace::interaction {
 
 /*
  * Interpolates a typename T using a transfer function.
@@ -44,7 +43,7 @@ public:
     void setDeltaTime(float deltaTime);
     void setTransferFunction(std::function<T(float)> transferFunction);
     void setInterpolationTime(float interpolationTime);
-	void step();
+    void step();
     
     float deltaTimeScaled() const;
     T value() const;
@@ -57,8 +56,7 @@ private:
     float _scaledDeltaTime;
 };
 
-} // namespace interaction
-} // namespace openspace
+} // namespace openspace::interaction
 
 #include "interpolator.inl"
 

include/openspace/interaction/interpolator.inl

@@ -26,8 +26,7 @@
 
 #include <functional>
 
-namespace openspace {
-namespace interaction {
+namespace openspace::interaction {
 
 template <typename T>
 Interpolator<T>::Interpolator()
@@ -81,5 +80,4 @@ bool Interpolator<T>::isInterpolating() const {
     return _t < 1.0 && _t >= 0.0;
 }
 
-} // namespace interaction
-} // namespace openspace
+} // namespace openspace::interaction

include/openspace/interaction/keybindingmanager.h

@@ -32,14 +32,13 @@
 #include <ghoul/misc/boolean.h>
 
 namespace openspace {
+    class Camera;
+    class SceneGraphNode;
+} // namespace
 
-class Camera;
-class SceneGraphNode;
+namespace openspace::interaction {
 
-namespace interaction {
-
-class KeyBindingManager : public DocumentationGenerator
-{
+class KeyBindingManager : public DocumentationGenerator {
 public:
     KeyBindingManager();
     ~KeyBindingManager() = default;
@@ -81,7 +80,6 @@ private:
     std::multimap<KeyWithModifier, KeyInformation> _keyLua;
 };
 
-} // namespace interaction
-} // namespace openspace
+} // namespace openspace::interaction
 
 #endif // __OPENSPACE_CORE___KEYBINDINGMANAGER___H__

include/openspace/interaction/keyframenavigator.h

@@ -28,17 +28,14 @@
 #include <openspace/util/timeline.h>
 #include <openspace/network/parallelconnection.h>
 
-#include <glm/glm.hpp>
+#include <ghoul/glm.h>
 #include <glm/gtx/quaternion.hpp>
 
-namespace openspace {
+namespace openspace { class Camera; }
 
-class Camera;
+namespace openspace::interaction {
 
-namespace interaction {
-
-class KeyframeNavigator
-{
+class KeyframeNavigator {
 public:
     struct CameraPose {
         glm::dvec3 position;
@@ -63,7 +60,6 @@ private:
     Timeline<CameraPose> _cameraPoseTimeline;
 };
 
-} // namespace interaction
-} // namespace openspace
+} // namespace openspace::interaction
 
 #endif // __OPENSPACE_CORE___KEYFRAMENAVIGATOR___H__

include/openspace/interaction/luaconsole.h

@@ -35,11 +35,7 @@
 #include <string>
 #include <vector>
 
-namespace ghoul {
-namespace opengl {
-    class ProgramObject;
-} // namespace opengl
-} // namespace ghoul
+namespace ghoul::opengl { class ProgramObject; }
 
 namespace openspace {
 

include/openspace/interaction/mousestate.h

@@ -28,10 +28,9 @@
 #include <openspace/interaction/delayedvariable.h>
 #include <openspace/interaction/inputstate.h>
 
-#include <glm/glm.hpp>
+#include <ghoul/glm.h>
 
-namespace openspace {
-namespace interaction {
+namespace openspace::interaction {
 
 struct MouseState {
     MouseState(double scaleFactor);
@@ -42,14 +41,13 @@ struct MouseState {
     DelayedVariable<glm::dvec2, double> velocity;
 };
 
-class MouseStates
-{
+class MouseStates {
 public:
     /**
-    \param sensitivity
-    \param velocityScaleFactor can be set to 60 to remove the inertia of the
-    interaction. Lower value will make it harder to move the camera. 
-    */
+     * \param sensitivity
+     * \param velocityScaleFactor can be set to 60 to remove the inertia of the
+     * interaction. Lower value will make it harder to move the camera. 
+     */
     MouseStates(double sensitivity, double velocityScaleFactor);
     void updateMouseStatesFromInput(const InputState& inputState, double deltaTime);
     void setRotationalFriction(double friction);
@@ -74,7 +72,6 @@ private:
     MouseState _globalRollMouseState;
 };
 
-} // namespace interaction
-} // namespace openspace
+} // namespace openspace::interaction
 
 #endif // __OPENSPACE_CORE___MOUSESTATE___H__

include/openspace/interaction/navigationhandler.h

@@ -38,11 +38,11 @@
 #include <ghoul/misc/boolean.h>
 
 namespace openspace {
+    class Camera;
+    class SceneGraphNode;
+} // namespace openspace
 
-class Camera;
-class SceneGraphNode;
-
-namespace interaction {
+namespace openspace::interaction {
 
 class NavigationHandler : public properties::PropertyOwner {
 public:
@@ -85,6 +85,7 @@ public:
     * interaction
     */
     static scripting::LuaLibrary luaLibrary();
+
 private:
     bool _cameraUpdatedFromScript = false;
 
@@ -99,7 +100,6 @@ private:
     properties::BoolProperty _useKeyFrameInteraction;
 };
 
-} // namespace interaction
-} // namespace openspace
+} // namespace openspace::interaction
 
 #endif // __OPENSPACE_CORE___NAVIGATIONHANDLER___H__

include/openspace/interaction/orbitalnavigator.h

@@ -34,16 +34,16 @@
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
 
-#include <glm/glm.hpp>
+#include <ghoul/glm.h>
 #include <glm/gtx/quaternion.hpp>
 
 namespace openspace {
+    class SceneGraphNode;
+    class Camera;
+    struct SurfacePositionHandle;
+} // namespace
 
-class SceneGraphNode;
-class Camera;
-class SurfacePositionHandle;
-
-namespace interaction {
+namespace openspace::interaction {
 
 class OrbitalNavigator : public properties::PropertyOwner  {
 public:
@@ -191,7 +191,6 @@ private:
         const glm::dvec3 cameraPositionWorldSpace);
 };
 
-} // namespace interaction
-} // namespace openspace
+} // namespace openspace::interaction
 
 #endif // __OPENSPACE_CORE___ORBITALNAVIGATOR___H__

include/openspace/mission/mission.h

@@ -34,6 +34,7 @@
 namespace ghoul { class Dictionary; }
 
 namespace openspace {
+
 namespace documentation {  struct Documentation; }
 
 /**

include/openspace/network/messagestructures.h

@@ -25,18 +25,14 @@
 #ifndef __OPENSPACE_CORE___MESSAGESTRUCTURES___H__
 #define __OPENSPACE_CORE___MESSAGESTRUCTURES___H__
 
-//std includes
 #include <string>
 #include <vector>
 
-//glm includes
 #include <glm/gtx/quaternion.hpp>
 
-//openspace includes
 #include <openspace/util/camera.h>
 
-namespace openspace{
-namespace datamessagestructures {
+namespace openspace::datamessagestructures {
 enum class Type : uint32_t {
     CameraData = 0,
     TimeData,
@@ -187,7 +183,6 @@ struct ScriptMessage {
     };
 };
             
-} //namespace messagestructures
-} // namespace openspace
+} // namespace openspace::messagestructures
 
 #endif // __OPENSPACE_CORE___MESSAGESTRUCTURES___H__

include/openspace/network/parallelconnection.h

@@ -25,20 +25,16 @@
 #ifndef __OPENSPACE_CORE___PARALLELCONNECTION___H__
 #define __OPENSPACE_CORE___PARALLELCONNECTION___H__
 
-//openspace includes
 #include <openspace/network/messagestructures.h>
 #include <openspace/properties/propertyowner.h>
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/numericalproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
 
-//glm includes
 #include <glm/gtx/quaternion.hpp>
 
-//ghoul includes
 #include <ghoul/designpattern/event.h>
 
-//std includes
 #include <string>
 #include <vector>
 #include <deque>
@@ -48,8 +44,6 @@
 #include <map>
 #include <condition_variable>
 
-
-
 #if defined(WIN32) || defined(__MING32__) || defined(__MING64__)
 typedef size_t _SOCKET;
 #else

include/openspace/performance/performancelayout.h

@@ -27,8 +27,7 @@
 
 #include <cstdint>
 
-namespace openspace {
-namespace performance {
+namespace openspace::performance {
 
 struct PerformanceLayout {
     static const int8_t Version = 0;
@@ -59,7 +58,6 @@ struct PerformanceLayout {
     int16_t nFunctionEntries;
 };
 
-} // namespace performance
-} // namespace openspace
+} // namespace openspace::performance
 
 #endif // __OPENSPACE_CORE___PERFORMANCELAYOUT___H__

include/openspace/performance/performancemanager.h

@@ -33,15 +33,11 @@
 #include <memory>
 #include <vector>
 
-namespace ghoul {
-    class SharedMemory;
-}
+namespace ghoul { class SharedMemory; }
 
-namespace openspace {
+namespace openspace { class SceneGraphNode; }
 
-class SceneGraphNode;
-
-namespace performance {
+namespace openspace::performance {
 
 class PerformanceManager {
 public:
@@ -99,7 +95,6 @@ private:
     bool createLogDir();
 };
 
-} // namespace performance
-} // namespace openspace
+} // namespace openspace::performance
 
 #endif // __OPENSPACE_CORE___PERFORMANCEMANAGER___H__

include/openspace/performance/performancemeasurement.h

@@ -31,8 +31,7 @@
 #include <chrono>
 #include <string>
 
-namespace openspace {
-namespace performance {
+namespace openspace::performance {
 
 class PerformanceManager;
 
@@ -59,7 +58,6 @@ private:
             OsEng.renderEngine().performanceManager() \
         )
     
-} // namespace performance
-} // namespace openspace
+} // namespace openspace::performance
 
 #endif // __OPENSPACE_CORE___PERFORMANCEMEASUREMENT___H__

include/openspace/properties/matrix/dmat2property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(DMat2Property, glm::dmat2x2);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___DMAT2PROPERTY___H__

include/openspace/properties/matrix/dmat2x3property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(DMat2x3Property, glm::dmat2x3);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___DMAT2X3PROPERTY___H__

include/openspace/properties/matrix/dmat2x4property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(DMat2x4Property, glm::dmat2x4);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___DMAT2X4PROPERTY___H__

include/openspace/properties/matrix/dmat3property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(DMat3Property, glm::dmat3x3);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___DMAT3PROPERTY___H__

include/openspace/properties/matrix/dmat3x2property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(DMat3x2Property, glm::dmat3x2);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___DMAT3X2PROPERTY___H__

include/openspace/properties/matrix/dmat3x4property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(DMat3x4Property, glm::dmat3x4);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___DMAT3X4PROPERTY___H__

include/openspace/properties/matrix/dmat4property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(DMat4Property, glm::dmat4x4);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___DMAT4PROPERTY___H__

include/openspace/properties/matrix/dmat4x2property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(DMat4x2Property, glm::dmat4x2);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___DMAT4X2PROPERTY___H__

include/openspace/properties/matrix/dmat4x3property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(DMat4x3Property, glm::dmat4x3);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___DMAT4X3PROPERTY___H__

include/openspace/properties/matrix/mat2property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(Mat2Property, glm::mat2x2);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___MAT2PROPERTY___H__

include/openspace/properties/matrix/mat2x3property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(Mat2x3Property, glm::mat2x3);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___MAT2X3PROPERTY___H__

include/openspace/properties/matrix/mat2x4property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(Mat2x4Property, glm::mat2x4);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___MAT2X4PROPERTY___H__

include/openspace/properties/matrix/mat3property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(Mat3Property, glm::mat3x3);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___MAT3PROPERTY___H__

include/openspace/properties/matrix/mat3x2property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(Mat3x2Property, glm::mat3x2);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___MAT3X2PROPERTY___H__

include/openspace/properties/matrix/mat3x4property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(Mat3x4Property, glm::mat3x4);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___MAT3X4PROPERTY___H__

include/openspace/properties/matrix/mat4property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(Mat4Property, glm::mat4x4);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___MAT4PROPERTY___H__

include/openspace/properties/matrix/mat4x2property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(Mat4x2Property, glm::mat4x2);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___MAT4X2PROPERTY___H__

include/openspace/properties/matrix/mat4x3property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(Mat4x3Property, glm::mat4x3);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___MAT4X3PROPERTY___H__

include/openspace/properties/numericalproperty.h

@@ -27,8 +27,7 @@
 
 #include <openspace/properties/templateproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 template <typename T>
 class NumericalProperty : public TemplateProperty<T> {
@@ -73,8 +72,7 @@ protected:
     T _stepping;
 };
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #include "openspace/properties/numericalproperty.inl"
 

include/openspace/properties/numericalproperty.inl

@@ -24,8 +24,7 @@
 
 #include <ghoul/lua/ghoul_lua.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 #define REGISTER_NUMERICALPROPERTY_HEADER(CLASS_NAME, TYPE)                              \
     typedef NumericalProperty<TYPE> CLASS_NAME;                                          \
@@ -361,5 +360,4 @@ std::string NumericalProperty<T>::generateAdditionalDescription() const {
     return result;
 }
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties

include/openspace/properties/optionproperty.h

@@ -29,8 +29,7 @@
 
 #include <vector>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 /**
  * The OptionProperty is a property that provides a number of predefined (using the 
@@ -131,7 +130,6 @@ private:
     DisplayType _displayType;
 };
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___OPTIONPROPERTY___H__

include/openspace/properties/property.h

@@ -28,13 +28,13 @@
 #include <openspace/properties/propertydelegate.h>
 
 #include <ghoul/misc/dictionary.h>
+
 #include <functional>
 #include <string>
 
 struct lua_State;
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 class PropertyOwner;
 
@@ -417,7 +417,6 @@ private:
     OnChangeHandle _currentHandleValue;
 };
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___PROPERTY___H__

include/openspace/properties/propertydelegate.h

@@ -29,8 +29,7 @@
 
 struct lua_State;
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 /**
  * The PropertyDelegate class is used by (among others) the TemplateProperty and the
@@ -158,8 +157,7 @@ public:
     static bool toString(std::string& outValue, U inValue);
 };
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #include <openspace/properties/propertydelegate.inl>
 

include/openspace/properties/propertydelegate.inl

@@ -24,8 +24,7 @@
 
 #include <typeinfo>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 template <typename T>
 std::string PropertyDelegate<T>::className() {
@@ -95,5 +94,4 @@ U PropertyDelegate<T>::fromString(std::string value, bool& success) {
         "Unimplemented PropertyDelegate::fromString specialization");
 }
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties

include/openspace/properties/propertyowner.h

@@ -29,8 +29,7 @@
 #include <string>
 #include <vector>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 class Property;
 
@@ -236,7 +235,6 @@ private:
     std::vector<std::string> _tags;
 };
 
-}  // namespace properties
-}  // namespace openspace
+}  // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___PROPERTYOWNER___H__

include/openspace/properties/scalar/boolproperty.h

@@ -42,12 +42,10 @@
 
 #include <openspace/properties/numericalproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_TEMPLATEPROPERTY_HEADER(BoolProperty, bool);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___BOOLPROPERTY___H__

include/openspace/properties/scalar/charproperty.h

@@ -42,12 +42,10 @@
 
 #include <openspace/properties/numericalproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(CharProperty, char);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___CHARPROPERTY___H__

include/openspace/properties/scalar/doubleproperty.h

@@ -42,12 +42,10 @@
 
 #include <openspace/properties/numericalproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(DoubleProperty, double);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___DOUBLEPROPERTY___H__

include/openspace/properties/scalar/floatproperty.h

@@ -42,12 +42,10 @@
 
 #include <openspace/properties/numericalproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(FloatProperty, float);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___FLOATPROPERTY___H__

include/openspace/properties/scalar/intproperty.h

@@ -42,12 +42,10 @@
 
 #include <openspace/properties/numericalproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(IntProperty, int);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___INTPROPERTY___H__

include/openspace/properties/scalar/longdoubleproperty.h

@@ -42,12 +42,10 @@
 
 #include <openspace/properties/numericalproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(LongDoubleProperty, long double);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___LONGDOUBLEPROPERTY___H__

include/openspace/properties/scalar/longlongproperty.h

@@ -42,12 +42,10 @@
 
 #include <openspace/properties/numericalproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(LongLongProperty, long long);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___LONGLONGPROPERTY___H__

include/openspace/properties/scalar/longproperty.h

@@ -42,12 +42,10 @@
 
 #include <openspace/properties/numericalproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(LongProperty, long);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___LONGPROPERTY___H__

include/openspace/properties/scalar/shortproperty.h

@@ -42,12 +42,10 @@
 
 #include <openspace/properties/numericalproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(ShortProperty, short);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___SHORTPROPERTY___H__

include/openspace/properties/scalar/signedcharproperty.h

@@ -42,12 +42,10 @@
 
 #include <openspace/properties/numericalproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(SignedCharProperty, signed char);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___SIGNEDCHARPROPERTY___H__

include/openspace/properties/scalar/ucharproperty.h

@@ -42,12 +42,10 @@
 
 #include <openspace/properties/numericalproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(UCharProperty, unsigned char);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___UCHARPROPERTY___H__

include/openspace/properties/scalar/uintproperty.h

@@ -42,12 +42,10 @@
 
 #include <openspace/properties/numericalproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(UIntProperty, unsigned int);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___UINTPROPERTY___H__

include/openspace/properties/scalar/ulonglongproperty.h

@@ -42,12 +42,10 @@
 
 #include <openspace/properties/numericalproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(ULongLongProperty, unsigned long long);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___ULONGLONGPROPERTY___H__

include/openspace/properties/scalar/ulongproperty.h

@@ -42,12 +42,10 @@
 
 #include <openspace/properties/numericalproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(ULongProperty, unsigned long);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___ULONGPROPERTY___H__

include/openspace/properties/scalar/ushortproperty.h

@@ -42,12 +42,10 @@
 
 #include <openspace/properties/numericalproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(UShortProperty, unsigned short);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___USHORTPROPERTY___H__

include/openspace/properties/scalar/wcharproperty.h

@@ -42,12 +42,10 @@
 
 #include <openspace/properties/numericalproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 //REGISTER_NUMERICALPROPERTY_HEADER(WCharProperty, wchar_t);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___WCHARPROPERTY___H__

include/openspace/properties/selectionproperty.h

@@ -29,8 +29,7 @@
 
 #include <vector>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 class SelectionProperty : public TemplateProperty<std::vector<int>> {
 public:
@@ -77,7 +76,6 @@ template <>
 template <>
 bool PropertyDelegate<TemplateProperty<std::vector<int>>>::toString(std::string& outValue, std::vector<int> inValue);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___SELECTIONPROPERTY___H__

include/openspace/properties/stringproperty.h

@@ -27,12 +27,10 @@
 
 #include <openspace/properties/templateproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_TEMPLATEPROPERTY_HEADER(StringProperty, std::string);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___STRINGPROPERTY___H__

include/openspace/properties/templateproperty.h

@@ -27,8 +27,7 @@
 
 #include <openspace/properties/property.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 /**
  * This concrete subclass of Property handles a single parameter value that is of type
@@ -91,7 +90,7 @@ public:
     virtual ghoul::any get() const override;
 
     /**
-     * Sets the value fro the provided ghoul::any object. If the types between
+     * Sets the value from the provided ghoul::any object. If the types between
      * <code>T</code> and <code>value</code> disagree, an error is logged and the stored
      * value remains unchanged.
      */
@@ -186,8 +185,7 @@ protected:
     T _value;
 };
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #include "openspace/properties/templateproperty.inl"
 

include/openspace/properties/templateproperty.inl

@@ -24,8 +24,7 @@
 
 #include <ghoul/logging/logmanager.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 // The following macros can be used to quickly generate the necessary PropertyDelegate
 // specializations required by the TemplateProperty class. Use the
@@ -240,16 +239,23 @@ const std::type_info& TemplateProperty<T>::type() const {
 
 template <typename T>
 bool TemplateProperty<T>::getLuaValue(lua_State* state) const {
-    bool success = PropertyDelegate<TemplateProperty<T>>::template toLuaValue<T>(state, _value);
+    bool success = PropertyDelegate<TemplateProperty<T>>::template toLuaValue<T>(
+        state,
+        _value
+    );
     return success;
 }
 
 template <typename T>
 bool TemplateProperty<T>::setLuaValue(lua_State* state) {
     bool success = false;
-    T thisValue = PropertyDelegate<TemplateProperty<T>>::template fromLuaValue<T>(state, success);
-    if (success)
+    T thisValue = PropertyDelegate<TemplateProperty<T>>::template fromLuaValue<T>(
+        state,
+        success
+    );
+    if (success) {
         set(ghoul::any(thisValue));
+    }
     return success;
 }
 
@@ -260,18 +266,24 @@ int TemplateProperty<T>::typeLua() const {
 
 template <typename T>
 bool TemplateProperty<T>::getStringValue(std::string& value) const {
-    bool success = PropertyDelegate<TemplateProperty<T>>::template toString<T>(value, _value);
+    bool success = PropertyDelegate<TemplateProperty<T>>::template toString<T>(
+        value,
+        _value
+    );
     return success;
 }
 
 template <typename T>
 bool TemplateProperty<T>::setStringValue(std::string value) {
     bool success = false;
-    T thisValue = PropertyDelegate<TemplateProperty<T>>::template fromString<T>(value, success);
-    if (success)
+    T thisValue = PropertyDelegate<TemplateProperty<T>>::template fromString<T>(
+        value,
+        success
+    );
+    if (success) {
         set(ghoul::any(thisValue));
+    }
     return success;
 }
 
-}  // namespace properties
-}  // namespace openspace
+}  // namespace openspace::properties

include/openspace/properties/triggerproperty.h

@@ -27,8 +27,7 @@
 
 #include <openspace/properties/property.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 /**
  * TriggerProperty that can be used to fire events into your code using the callback
@@ -67,7 +66,6 @@ public:
     void set(ghoul::any value);
 };
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___TRIGGERPROPERTY___H__

include/openspace/properties/vector/bvec2property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_TEMPLATEPROPERTY_HEADER(BVec2Property, glm::bvec2);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___BVEC2PROPERTY___H__

include/openspace/properties/vector/bvec3property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_TEMPLATEPROPERTY_HEADER(BVec3Property, glm::bvec3);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___BVEC3PROPERTY___H__

include/openspace/properties/vector/bvec4property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_TEMPLATEPROPERTY_HEADER(BVec4Property, glm::bvec4);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___BVEC4PROPERTY___H__

include/openspace/properties/vector/dvec2property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(DVec2Property, glm::dvec2);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___DVEC2PROPERTY___H__

include/openspace/properties/vector/dvec3property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(DVec3Property, glm::dvec3);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___DVEC3PROPERTY___H__

include/openspace/properties/vector/dvec4property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(DVec4Property, glm::dvec4);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___DVEC4PROPERTY___H__

include/openspace/properties/vector/ivec2property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(IVec2Property, glm::ivec2);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___IVEC2PROPERTY___H__