Merge branch 'master' into feature/general-performance

CMakeLists.txt

@@ -155,7 +155,7 @@ endif ()
 
 # Ghoul
 add_subdirectory(${OPENSPACE_EXT_DIR}/ghoul)
-target_link_libraries(openspace-core Ghoul)
+target_link_libraries(openspace-core PUBLIC Ghoul)
 set_openspace_compile_settings(Ghoul)
 set_folder_location(Lua "External")
 set_folder_location(lz4 "External")
@@ -165,7 +165,7 @@ link_directories("${GHOUL_LIBRARY_DIRS}")
 # Spice
 begin_dependency("Spice")
 add_subdirectory(${OPENSPACE_EXT_DIR}/spice)
-target_link_libraries(openspace-core Spice)
+target_link_libraries(openspace-core PUBLIC Spice)
 set_folder_location(Spice "External")
 end_dependency()
 
@@ -174,13 +174,13 @@ begin_dependency("CURL")
 if (WIN32)
   set(CURL_ROOT_DIR "${OPENSPACE_EXT_DIR}/curl")
   target_include_directories(openspace-core SYSTEM PUBLIC ${CURL_ROOT_DIR}/include)
-  target_link_libraries(openspace-core ${CURL_ROOT_DIR}/lib/libcurl.lib)
+  target_link_libraries(openspace-core PUBLIC ${CURL_ROOT_DIR}/lib/libcurl.lib)
   target_compile_definitions(openspace-core PUBLIC "OPENSPACE_CURL_ENABLED" "CURL_STATICLIB")
 else ()
   find_package(CURL)
   if (CURL_FOUND)
     target_include_directories(openspace-core SYSTEM PUBLIC ${CURL_INCLUDE_DIRS})
-    target_link_libraries(openspace-core ${CURL_LIBRARIES})
+    target_link_libraries(openspace-core PUBLIC ${CURL_LIBRARIES})
     target_compile_definitions(openspace-core PUBLIC "OPENSPACE_CURL_ENABLED")
   endif ()
 endif ()

data/assets/base.asset

@@ -19,11 +19,11 @@ asset.require('scene/solarsystem/planets/mars/moons/deimos')
 asset.require('scene/solarsystem/dwarf_planets/pluto/system')
 asset.require('scene/solarsystem/dwarf_planets/pluto/default_layers')
 asset.require('scene/solarsystem/dwarf_planets/pluto/charon/default_layers')
-asset.request('scene/milkyway/milkyway/volume')
-asset.request('scene/milkyway/constellations/constellation_art')
-asset.request('scene/milkyway/constellations/constellation_keybinds')
+asset.require('scene/milkyway/milkyway/volume')
+asset.require('scene/milkyway/constellations/constellation_art')
+asset.require('scene/milkyway/constellations/constellation_keybinds')
 
-assetHelper.requestAll(asset, 'scene/digitaluniverse')
+assetHelper.requireAll(asset, 'scene/digitaluniverse')
 
 -- Load default key bindings applicable to most scenes
 asset.require('util/default_keybindings')
@@ -33,7 +33,7 @@ asset.require('util/default_joystick')
 -- Load web gui
 local webGui = asset.require('util/webgui')
 
-asset.request('customization/globebrowsing')
+asset.require('customization/globebrowsing')
 
 -- Keybindings that are specific for this scene
 local Keybindings = {

data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset

@@ -1,7 +1,7 @@
 local assetHelper = asset.require('util/asset_helper')
 local transforms = asset.require('./../transforms')
 asset.require("spice/base")
-asset.request('./../trail')
+asset.require('../trail')
 local labelsPath = asset.require('./../pluto_globelabels').LabelsPath
 
 

data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset

@@ -1,7 +1,7 @@
 local assetHelper = asset.require('util/asset_helper')
 local transforms = asset.require('./transforms')
 asset.require("spice/base")
-asset.request('./trail')
+asset.require('./trail')
 local labelsPath = asset.require('./pluto_globelabels').LabelsPath
 
 

data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset

@@ -1,10 +1,10 @@
-asset.request('./trail')
-asset.request('./pluto')
-asset.request('./pluto_trail')
-asset.request('./charon/charon')
-asset.request('./charon/charon_trail')
-asset.request('./minor/hydra')
-asset.request('./minor/kerberos')
-asset.request('./minor/nix')
-asset.request('./minor/styx')
+asset.require('./trail')
+asset.require('./pluto')
+asset.require('./pluto_trail')
+asset.require('./charon/charon')
+asset.require('./charon/charon_trail')
+asset.require('./minor/hydra')
+asset.require('./minor/kerberos')
+asset.require('./minor/nix')
+asset.require('./minor/styx')
 

data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset

@@ -1,7 +1,7 @@
-asset.request('./bennu')
-asset.request('./model')
-asset.request('./trail')
-asset.request('scene/solarsystem/sun/marker')
+asset.require('./bennu')
+asset.require('./model')
+asset.require('./trail')
+asset.require('scene/solarsystem/sun/marker')
 
 asset.require('./script_schedule')
 

data/assets/scene/solarsystem/planets/earth/earth.asset

@@ -2,7 +2,7 @@ local transforms = asset.require('./transforms')
 local assetHelper = asset.require('util/asset_helper')
 local labelsPath = asset.require('./earth_globelabels').LabelsPath
 
-asset.request('./trail')
+asset.require('./trail')
 
 -- local earthEllipsoid = { 6378137.0, 6378137.0, 6356752.314245 }
 local earthEllipsoid = { 6378137.0, 6378137.0, 6378137.0 }

data/assets/scene/solarsystem/planets/earth/moon/moon.asset

@@ -3,7 +3,7 @@ local transforms = asset.require('scene/solarsystem/planets/earth/transforms')
 local sunAsset = asset.require('scene/solarsystem/sun/sun')
 local earthAsset = asset.require('../earth')
 asset.require('spice/base')
-asset.request('./trail')
+asset.require('./trail')
 local labelsPath = asset.require('./moon_labels').LabelsPath
 
 local Moon = {

data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset

@@ -1,8 +1,8 @@
-asset.request('./satellites_communications')
+asset.require('./satellites_communications')
 -- The debris contains a **lot** of nodes, so we disable it on default
--- asset.request('./satellites_debris')
-asset.request('./satellites_interesting')
-asset.request('./satellites_misc')
-asset.request('./satellites_navigation')
-asset.request('./satellites_science')
-asset.request('./satellites_weather')
+-- asset.require('./satellites_debris')
+asset.require('./satellites_interesting')
+asset.require('./satellites_misc')
+asset.require('./satellites_navigation')
+asset.require('./satellites_science')
+asset.require('./satellites_weather')

data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset

@@ -1,13 +1,13 @@
-asset.request('./communications/geostationary')
-asset.request('./communications/intelsat')
-asset.request('./communications/ses')
-asset.request('./communications/iridium')
-asset.request('./communications/iridium_next')
-asset.request('./communications/orbcomm')
-asset.request('./communications/globalstar')
-asset.request('./communications/amateur')
-asset.request('./communications/experimental')
-asset.request('./communications/other_comm')
-asset.request('./communications/gorizont')
-asset.request('./communications/raduga')
-asset.request('./communications/molniya')
+asset.require('./communications/geostationary')
+asset.require('./communications/intelsat')
+asset.require('./communications/ses')
+asset.require('./communications/iridium')
+asset.require('./communications/iridium_next')
+asset.require('./communications/orbcomm')
+asset.require('./communications/globalstar')
+asset.require('./communications/amateur')
+asset.require('./communications/experimental')
+asset.require('./communications/other_comm')
+asset.require('./communications/gorizont')
+asset.require('./communications/raduga')
+asset.require('./communications/molniya')

data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset

@@ -1,5 +1,5 @@
-asset.request('./debris/debris_asat')
-asset.request('./debris/debris_breezem')
-asset.request('./debris/debris_fengyun')
-asset.request('./debris/debris_iridium33')
-asset.request('./debris/debris_kosmos2251')
+asset.require('./debris/debris_asat')
+asset.require('./debris/debris_breezem')
+asset.require('./debris/debris_fengyun')
+asset.require('./debris/debris_iridium33')
+asset.require('./debris/debris_kosmos2251')

data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset

@@ -1,4 +1,4 @@
-asset.request('./misc/military')
-asset.request('./misc/radar')
-asset.request('./misc/cubesats')
-asset.request('./misc/other')
+asset.require('./misc/military')
+asset.require('./misc/radar')
+asset.require('./misc/cubesats')
+asset.require('./misc/other')

data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset

@@ -1,7 +1,7 @@
-asset.request('./navigation/beidou')
-asset.request('./navigation/galileo')
-asset.request('./navigation/glosnass')
-asset.request('./navigation/gps')
-asset.request('./navigation/musson')
-asset.request('./navigation/nnss')
-asset.request('./navigation/sbas')
+asset.require('./navigation/beidou')
+asset.require('./navigation/galileo')
+asset.require('./navigation/glosnass')
+asset.require('./navigation/gps')
+asset.require('./navigation/musson')
+asset.require('./navigation/nnss')
+asset.require('./navigation/sbas')

data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset

@@ -1,4 +1,4 @@
-asset.request('./science/spaceearth')
-asset.request('./science/geodetic')
-asset.request('./science/engineering')
-asset.request('./science/education')
+asset.require('./science/spaceearth')
+asset.require('./science/geodetic')
+asset.require('./science/engineering')
+asset.require('./science/education')

data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset

@@ -1,10 +1,10 @@
-asset.request('./weather/argos')
-asset.request('./weather/dmc')
-asset.request('./weather/earth_resources')
-asset.request('./weather/goes')
-asset.request('./weather/noaa')
-asset.request('./weather/planet')
-asset.request('./weather/sarsat')
-asset.request('./weather/spire')
-asset.request('./weather/tdrss')
-asset.request('./weather/weather')
+asset.require('./weather/argos')
+asset.require('./weather/dmc')
+asset.require('./weather/earth_resources')
+asset.require('./weather/goes')
+asset.require('./weather/noaa')
+asset.require('./weather/planet')
+asset.require('./weather/sarsat')
+asset.require('./weather/spire')
+asset.require('./weather/tdrss')
+asset.require('./weather/weather')

data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset

@@ -1,7 +1,7 @@
 local transforms = asset.require('../transforms')
 local assetHelper = asset.require('util/asset_helper')
 asset.require("spice/base")
-asset.request('./trail')
+asset.require('./trail')
 local kernel = asset.require('../kernels').jup310
 local labelsPath = asset.require('../jupiter_globelabels').LabelsPath
 

data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset

@@ -1,7 +1,7 @@
 local transforms = asset.require('../transforms')
 local assetHelper = asset.require('util/asset_helper')
 asset.require("spice/base")
-asset.request('./trail')
+asset.require('./trail')
 local kernel = asset.require('../kernels').jup310
 local labelsPath = asset.require('../jupiter_globelabels').LabelsPath
 

data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset

@@ -1,7 +1,7 @@
 local transforms = asset.require('../transforms')
 local assetHelper = asset.require('util/asset_helper')
 asset.require("spice/base")
-asset.request('./trail')
+asset.require('./trail')
 local kernel = asset.require('../kernels').jup310
 local labelsPath = asset.require('../jupiter_globelabels').LabelsPath
 

data/assets/scene/solarsystem/planets/jupiter/io/io.asset

@@ -1,7 +1,7 @@
 local transforms = asset.require('../transforms')
 local assetHelper = asset.require('util/asset_helper')
 asset.require("spice/base")
-asset.request('./trail')
+asset.require('./trail')
 local kernel = asset.require('../kernels').jup310
 local labelsPath = asset.require('../jupiter_globelabels').LabelsPath
 

data/assets/scene/solarsystem/planets/jupiter/jupiter.asset

@@ -1,7 +1,7 @@
 local transforms = asset.require('./transforms')
 local assetHelper = asset.require('util/asset_helper')
 asset.require("spice/base")
-asset.request('./trail')
+asset.require('./trail')
 
 local Jupiter = {
     Identifier = "Jupiter",

data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset

@@ -1,8 +1,8 @@
-asset.request('./minor/ananke_group')
-asset.request('./minor/carme_group')
-asset.request('./minor/carpo_group')
-asset.request('./minor/himalia_group')
-asset.request('./minor/inner_group')
-asset.request('./minor/other_groups')
-asset.request('./minor/pasiphae_group')
-asset.request('./minor/themisto_group')
+asset.require('./minor/ananke_group')
+asset.require('./minor/carme_group')
+asset.require('./minor/carpo_group')
+asset.require('./minor/himalia_group')
+asset.require('./minor/inner_group')
+asset.require('./minor/other_groups')
+asset.require('./minor/pasiphae_group')
+asset.require('./minor/themisto_group')

data/assets/scene/solarsystem/planets/mars/mars.asset

@@ -1,7 +1,7 @@
 local transforms = asset.require('./transforms')
 local assetHelper = asset.require('util/asset_helper')
 asset.require("spice/base")
-asset.request('./trail')
+asset.require('./trail')
 local labelsPath = asset.require('./mars_globelabels').LabelsPath
 
 -- local marsRadii = { 3396190.0, 3396190.0, 3376200.0 }

data/assets/scene/solarsystem/planets/mercury/mercury.asset

@@ -3,7 +3,7 @@ local transforms = asset.require('./transforms')
 local labelsPath = asset.require('./mercury_globelabels').LabelsPath
 
 asset.require("spice/base")
-asset.request('./trail')
+asset.require('./trail')
 
 local Mercury = {
     Identifier = "Mercury",

data/assets/scene/solarsystem/planets/neptune/major_moons.asset

@@ -1 +1 @@
-asset.request('./triton')
+asset.require('./triton')

data/assets/scene/solarsystem/planets/neptune/neptune.asset

@@ -1,7 +1,7 @@
 local assetHelper = asset.require('util/asset_helper')
 local transforms = asset.require('./transforms')
 asset.require("spice/base")
-asset.request('./trail')
+asset.require('./trail')
 
 local Neptune = {
     Identifier = "Neptune",

data/assets/scene/solarsystem/planets/planets.asset

@@ -1,27 +1,27 @@
-asset.request('./mercury/mercury')
+asset.require('./mercury/mercury')
 
-asset.request('./venus/venus')
-asset.request('./venus/atmosphere')
+asset.require('./venus/venus')
+asset.require('./venus/atmosphere')
 
-asset.request('./earth/earth')
-asset.request('./earth/atmosphere')
-asset.request('./earth/markers')
-asset.request('./earth/moon/moon')
+asset.require('./earth/earth')
+asset.require('./earth/atmosphere')
+asset.require('./earth/markers')
+asset.require('./earth/moon/moon')
 
-asset.request('./mars/mars')
-asset.request('./mars/atmosphere')
+asset.require('./mars/mars')
+asset.require('./mars/atmosphere')
 
-asset.request('./jupiter/jupiter')
-asset.request('./jupiter/major_moons')
+asset.require('./jupiter/jupiter')
+asset.require('./jupiter/major_moons')
 
-asset.request('./saturn/saturn')
-asset.request('./saturn/major_moons')
+asset.require('./saturn/saturn')
+asset.require('./saturn/major_moons')
 
-asset.request('./uranus/uranus')
-asset.request('./uranus/major_moons')
+asset.require('./uranus/uranus')
+asset.require('./uranus/major_moons')
 
-asset.request('./neptune/neptune')
-asset.request('./neptune/major_moons')
+asset.require('./neptune/neptune')
+asset.require('./neptune/major_moons')
 
 
 asset.meta = {

data/assets/scene/solarsystem/planets/saturn/dione/dione.asset

@@ -1,7 +1,7 @@
 local transforms = asset.require('../transforms')
 local assetHelper = asset.require('util/asset_helper')
 local kernel = asset.require('../kernels').sat375
-asset.request('./trail')
+asset.require('./trail')
 local labelsPath = asset.require('../saturn_globelabels').LabelsPath
 
 local Dione = {

data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset

@@ -1,7 +1,7 @@
 local transforms = asset.require('../transforms')
 local assetHelper = asset.require('util/asset_helper')
 local kernel = asset.require('../kernels').sat375
-asset.request('./trail')
+asset.require('./trail')
 local labelsPath = asset.require('../saturn_globelabels').LabelsPath
 
 local Enceladus = {

data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset

@@ -1,7 +1,7 @@
 local transforms = asset.require('../transforms')
 local assetHelper = asset.require('util/asset_helper')
 local kernel = asset.require('../kernels').sat375
-asset.request('./trail')
+asset.require('./trail')
 
 
 

data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset

@@ -1,7 +1,7 @@
 local transforms = asset.require('../transforms')
 local assetHelper = asset.require('util/asset_helper')
 local kernel = asset.require('../kernels').sat375
-asset.request('./trail')
+asset.require('./trail')
 local labelsPath = asset.require('../saturn_globelabels').LabelsPath
 
 local Iapetus = {

data/assets/scene/solarsystem/planets/saturn/major_moons.asset

@@ -1,8 +1,8 @@
-asset.request('./dione/dione')
-asset.request('./enceladus/enceladus')
-asset.request('./hyperion/hyperion')
-asset.request('./iapetus/iapetus')
-asset.request('./mimas/mimas')
-asset.request('./rhea/rhea')
-asset.request('./tethys/tethys')
-asset.request('./titan/titan')
+asset.require('./dione/dione')
+asset.require('./enceladus/enceladus')
+asset.require('./hyperion/hyperion')
+asset.require('./iapetus/iapetus')
+asset.require('./mimas/mimas')
+asset.require('./rhea/rhea')
+asset.require('./tethys/tethys')
+asset.require('./titan/titan')

data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset

@@ -1,7 +1,7 @@
 local transforms = asset.require('../transforms')
 local assetHelper = asset.require('util/asset_helper')
 local kernel = asset.require('../kernels').sat375
-asset.request('./trail')
+asset.require('./trail')
 local labelsPath = asset.require('../saturn_globelabels').LabelsPath
 
 local Mimas = {

data/assets/scene/solarsystem/planets/saturn/minor_moons.asset

@@ -1,4 +1,4 @@
-asset.request('./minor/gallic_group')
-asset.request('./minor/inuit_group')
-asset.request('./minor/norse_group')
-asset.request('./minor/other_group')
+asset.require('./minor/gallic_group')
+asset.require('./minor/inuit_group')
+asset.require('./minor/norse_group')
+asset.require('./minor/other_group')

data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset

@@ -1,7 +1,7 @@
 local transforms = asset.require('../transforms')
 local assetHelper = asset.require('util/asset_helper')
 local kernel = asset.require('../kernels').sat375
-asset.request('./trail')
+asset.require('./trail')
 local labelsPath = asset.require('../saturn_globelabels').LabelsPath
 
 local Rhea = {

data/assets/scene/solarsystem/planets/saturn/saturn.asset

@@ -1,7 +1,7 @@
 local transforms = asset.require('./transforms')
 local assetHelper = asset.require('util/asset_helper')
 asset.require("spice/base")
-asset.request('./trail')
+asset.require('./trail')
 
 local textures = asset.syncedResource({
     Type = "HttpSynchronization",

data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset

@@ -1,7 +1,7 @@
 local transforms = asset.require('../transforms')
 local assetHelper = asset.require('util/asset_helper')
 local kernel = asset.require('../kernels').sat375
-asset.request('./trail')
+asset.require('./trail')
 local labelsPath = asset.require('../saturn_globelabels').LabelsPath
 
 local Tethys = {

data/assets/scene/solarsystem/planets/saturn/titan/titan.asset

@@ -1,7 +1,7 @@
 local transforms = asset.require('../transforms')
 local assetHelper = asset.require('util/asset_helper')
 local kernel = asset.require('../kernels').sat375
-asset.request('./trail')
+asset.require('./trail')
 local labelsPath = asset.require('../saturn_globelabels').LabelsPath
 
 local Titan = {

data/assets/scene/solarsystem/planets/uranus/minor_moons.asset

@@ -1,3 +1,3 @@
-asset.request('./inner_moons')
-asset.request('./irregular_prograde_moons')
-asset.request('./irregular_retrograde_moons')
+asset.require('./inner_moons')
+asset.require('./irregular_prograde_moons')
+asset.require('./irregular_retrograde_moons')

data/assets/scene/solarsystem/planets/uranus/uranus.asset

@@ -1,7 +1,7 @@
 local assetHelper = asset.require('util/asset_helper')
 local transforms = asset.require('./transforms')
 asset.require("spice/base")
-asset.request('./trail')
+asset.require('./trail')
 
 local Uranus = {
     Identifier = "Uranus",

data/assets/scene/solarsystem/planets/venus/venus.asset

@@ -1,7 +1,7 @@
 local assetHelper = asset.require('util/asset_helper')
 local transforms = asset.require('./transforms')
 asset.require("spice/base")
-asset.request('./trail')
+asset.require('./trail')
 local labelsPath = asset.require('./venus_globelabels').LabelsPath
 
 local Venus = {

data/assets/scene/solarsystem/sun.asset

@@ -1,2 +1,2 @@
-asset.request('./sun/sun')
-asset.request('./sun/glare')
+asset.require('./sun/sun')
+asset.require('./sun/glare')

data/assets/sync/everything.asset

@@ -4,7 +4,7 @@
 
 local assetHelper = asset.require('../util/asset_helper')
 
-assetHelper.requestAll(asset, '../customization')
-assetHelper.requestAll(asset, '../scene')
-assetHelper.requestAll(asset, '../spice')
-assetHelper.requestAll(asset, '../util')
+assetHelper.requireAll(asset, '../customization')
+assetHelper.requireAll(asset, '../scene')
+assetHelper.requireAll(asset, '../spice')
+assetHelper.requireAll(asset, '../util')

data/assets/util/asset_helper.asset

@@ -132,21 +132,6 @@ local requireAll = function (sceneAsset, directory)
     return result
 end
 
-local requestAll = function (sceneAsset, directory)
-    function string.ends(String,End)
-       return End=='' or string.sub(String,-string.len(End))==End
-    end
-
-    local files = openspace.walkDirectoryFiles(sceneAsset.localResource('') .. directory, true)
-    for _, file in pairs(files) do
-        if file:ends('.asset') then
-            openspace.printDebug("Requesting: " .. file:sub(file:find(directory), -7))
-            sceneAsset.request(file:sub(file:find(directory), -7))
-        end
-    end
-end
-
-
 local getDefaultLightSources = function (solarSystemBarycenterIdentifier)
     local sourceList = {
         {
@@ -203,6 +188,5 @@ asset.export("registerScreenSpaceRenderables", registerScreenSpaceRenderables)
 asset.export("registerSpiceKernels", registerSpiceKernels)
 asset.export("registerDashboardItems", registerDashboardItems)
 asset.export("requireAll", requireAll)
-asset.export("requestAll", requestAll)
 asset.export("getDefaultLightSources", getDefaultLightSources)
 asset.export("createModelPart", createModelPart)

data/assets/util/default_keybindings.asset

@@ -109,7 +109,39 @@ openspace.setPropertyValueSingle("RenderEngine.ShowCamera", not isEnabled)]],
         Documentation = "Toggles the rendering on master",
         GuiPath = "/Rendering",
         Local = true
-    }
+    },
+    {
+        Key = "Right",
+        Name = "Next Delta Time Step (Interpolate)",
+        Command = "openspace.time.interpolateNextDeltaTimeStep()",
+        Documentation = "Smoothly interpolates the simulation speed to the next delta time step, if one exists.",
+        GuiPath = "/Simulation Speed",
+        Local = true
+    },
+    {
+        Key = "Shift+Right",
+        Name = "Next Delta Time Step (Immediate)",
+        Command = "openspace.time.setNextDeltaTimeStep()",
+        Documentation = "Immediately set the simulation speed to the next delta time step, if one exists.",
+        GuiPath = "/Simulation Speed",
+        Local = true
+    },
+    {
+        Key = "Left",
+        Name = "Previous Delta Time Step (Interpolate)",
+        Command = "openspace.time.interpolatePreviousDeltaTimeStep()",
+        Documentation = "Smoothly interpolates the simulation speed to the previous delta time step, if one exists.",
+        GuiPath = "/Simulation Speed",
+        Local = true
+    },
+    {
+        Key = "Shift+Left",
+        Name = "Previous Delta Time Step (Immediate)",
+        Command = "openspace.time.setPreviousDeltaTimeStep()",
+        Documentation = "Immediately set the simulation speed to the previous delta time step, if one exists.",
+        GuiPath = "/Simulation Speed",
+        Local = true
+    },
 }
 
 local DeltaTimeKeys

data/assets/util/vrt_flipbook_helper.asset

@@ -10,39 +10,39 @@ end
 
 local nextFlipbookPage = function (flipbook)
 
-	if (flipbook.CurrentFlipIndex >= 0) then
-		local assetSring = flipbook.AssetPrefix .. flipbook.CurrentFlipIndex; 
-		openspace.setPropertyValueSingle("Scene." .. flipbook.AssetGlobe .. ".Renderable.Layers.ColorLayers.".. assetSring .. ".Enabled", false)
-	end
+    if (flipbook.CurrentFlipIndex >= 0) then
+        local assetSring = flipbook.AssetPrefix .. flipbook.CurrentFlipIndex; 
+        openspace.setPropertyValueSingle("Scene." .. flipbook.AssetGlobe .. ".Renderable.Layers.ColorLayers.".. assetSring .. ".Enabled", false)
+    end
 
-	if (flipbook.CurrentFlipIndex < flipbook.TotalCount - 1) then
-		flipbook.CurrentFlipIndex = flipbook.CurrentFlipIndex + 1;
-		local assetSring = flipbook.AssetPrefix .. flipbook.CurrentFlipIndex; 
-		openspace.setPropertyValueSingle("Scene." .. flipbook.AssetGlobe .. ".Renderable.Layers.ColorLayers.".. assetSring .. ".Enabled", true)
-	end
+    if (flipbook.CurrentFlipIndex < flipbook.TotalCount - 1) then
+        flipbook.CurrentFlipIndex = flipbook.CurrentFlipIndex + 1;
+        local assetSring = flipbook.AssetPrefix .. flipbook.CurrentFlipIndex; 
+        openspace.setPropertyValueSingle("Scene." .. flipbook.AssetGlobe .. ".Renderable.Layers.ColorLayers.".. assetSring .. ".Enabled", true)
+    end
 end
 
 local previousFlipbookPage = function (flipbook)
 
-	if (localIndex == -1) then
-		return
-	end
+    if (localIndex == -1) then
+        return
+    end
 
-	local localIndex = flipbook.CurrentFlipIndex;
+    local localIndex = flipbook.CurrentFlipIndex;
 
-	local assetSring = flipbook.AssetPrefix .. localIndex; 
-	openspace.setPropertyValueSingle("Scene." .. flipbook.AssetGlobe .. ".Renderable.Layers.ColorLayers.".. assetSring .. ".Enabled", false)
-	localIndex = localIndex - 1;
+    local assetSring = flipbook.AssetPrefix .. localIndex; 
+    openspace.setPropertyValueSingle("Scene." .. flipbook.AssetGlobe .. ".Renderable.Layers.ColorLayers.".. assetSring .. ".Enabled", false)
+    localIndex = localIndex - 1;
 
-	if (localIndex >= 0 ) then
-		assetSring = flipbook.AssetPrefix .. localIndex; 
-		openspace.setPropertyValueSingle("Scene." .. flipbook.AssetGlobe .. ".Renderable.Layers.ColorLayers.".. assetSring .. ".Enabled", true)
-	end
+    if (localIndex >= 0 ) then
+        assetSring = flipbook.AssetPrefix .. localIndex; 
+        openspace.setPropertyValueSingle("Scene." .. flipbook.AssetGlobe .. ".Renderable.Layers.ColorLayers.".. assetSring .. ".Enabled", true)
+    end
 
-	if (localIndex < -1) then
-		localIndex = -1
-	end
-	flipbook.CurrentFlipIndex = localIndex;
+    if (localIndex < -1) then
+        localIndex = -1
+    end
+    flipbook.CurrentFlipIndex = localIndex;
 
 end
 

data/profiles/asteroids.profile

@@ -14,7 +14,7 @@ scene/solarsystem/sssb/encke-type_comet
 scene/solarsystem/sssb/halley-type_comet	
 scene/solarsystem/sssb/inner_main_belt_asteroid	
 scene/solarsystem/sssb/jupiter_trojan_asteroid	
-scene/solarsystem/sssb/jupiter-family_comet
+scene/solarsystem/sssb/jupiter-family_comet 
 scene/solarsystem/sssb/main_belt_asteroid	
 scene/solarsystem/sssb/mars-crossing_asteroid	
 scene/solarsystem/sssb/outer_main_belt_asteroid	

include/openspace/scene/assetloader.h

@@ -45,7 +45,6 @@ int onDeinitialize(lua_State* state);
 int onInitializeDependency(lua_State* state);
 int onDeinitializeDependency(lua_State* state);
 int require(lua_State* state);
-int request(lua_State* state);
 int exists(lua_State* state);
 int localResource(lua_State* state);
 int syncedResource(lua_State* state);
@@ -164,7 +163,6 @@ public:
     void assetUnrequested(Asset* parent, std::shared_ptr<Asset> child);
 
 private:
-    std::shared_ptr<Asset> request(const std::string& identifier);
     void unrequest(const std::string& identifier);
 
     void setUpAssetLuaTable(Asset* asset);
@@ -194,7 +192,6 @@ private:
     friend int assetloader::onInitializeDependency(lua_State* state);
     friend int assetloader::onDeinitializeDependency(lua_State* state);
     friend int assetloader::require(lua_State* state);
-    friend int assetloader::request(lua_State* state);
     friend int assetloader::exists(lua_State* state);
     friend int assetloader::localResource(lua_State* state);
     friend int assetloader::syncedResource(lua_State* state);

include/openspace/scene/profile.h

@@ -151,6 +151,7 @@ private:
     std::vector<Property> properties;
     std::vector<Keybinding> keybindings;
     std::optional<Time> time;
+    std::vector<double> deltaTimes;
     std::optional<CameraType> camera;
     std::vector<std::string> markNodes;
     std::vector<std::string> additionalScripts;

include/openspace/util/timemanager.h

@@ -29,6 +29,7 @@
 #include <openspace/util/time.h>
 #include <openspace/util/timeline.h>
 #include <functional>
+#include <optional>
 #include <utility>
 #include <vector>
 
@@ -68,6 +69,7 @@ public:
     void setTimeNextFrame(Time t);
     void setDeltaTime(double deltaTime);
     void setPause(bool pause);
+    void setDeltaTimeSteps(const std::vector<double> deltaTimes);
 
     /**
      * Returns the delta time, unaffected by pause
@@ -80,6 +82,8 @@ public:
     double deltaTime() const;
     bool isPaused() const;
 
+    std::vector<double> deltaTimeSteps() const;
+
     float defaultTimeInterpolationDuration() const;
     float defaultDeltaTimeInterpolationDuration() const;
     float defaultPauseInterpolationDuration() const;
@@ -90,6 +94,15 @@ public:
     void interpolateDeltaTime(double targetDeltaTime, double durationSeconds);
     void interpolatePause(bool pause, double durationSeconds);
 
+    std::optional<double> nextDeltaTimeStep();
+    std::optional<double> previousDeltaTimeStep();
+    bool hasNextDeltaTimeStep() const;
+    bool hasPreviousDeltaTimeStep() const;
+    void setNextDeltaTimeStep();
+    void setPreviousDeltaTimeStep();
+    void interpolateNextDeltaTimeStep(double durationSeconds);
+    void interpolatePreviousDeltaTimeStep(double durationSeconds);
+
     void addKeyframe(double timestamp, TimeKeyframeData kf);
     void removeKeyframesBefore(double timestamp, bool inclusive = false);
     void removeKeyframesAfter(double timestamp, bool inclusive = false);
@@ -99,11 +112,13 @@ public:
 
     CallbackHandle addTimeChangeCallback(TimeChangeCallback cb);
     CallbackHandle addDeltaTimeChangeCallback(TimeChangeCallback cb);
+    CallbackHandle addDeltaTimeStepsChangeCallback(TimeChangeCallback cb);
     CallbackHandle addTimeJumpCallback(TimeChangeCallback cb);
     CallbackHandle addTimelineChangeCallback(TimeChangeCallback cb);
 
     void removeTimeChangeCallback(CallbackHandle handle);
     void removeDeltaTimeChangeCallback(CallbackHandle handle);
+    void removeDeltaTimeStepsChangeCallback(CallbackHandle handle);
     void triggerPlaybackStart();
     void removeTimeJumpCallback(CallbackHandle handle);
     void removeTimelineChangeCallback(CallbackHandle handle);
@@ -126,6 +141,9 @@ private:
     double _lastDeltaTime = 0.0;
     double _lastTargetDeltaTime = 0.0;
 
+    std::vector<double> _deltaTimeSteps;
+    bool _deltaTimeStepsChanged = false;
+
     properties::FloatProperty _defaultTimeInterpolationDuration;
     properties::FloatProperty _defaultDeltaTimeInterpolationDuration;
     properties::FloatProperty _defaultPauseInterpolationDuration;
@@ -142,6 +160,7 @@ private:
 
     std::vector<std::pair<CallbackHandle, TimeChangeCallback>> _timeChangeCallbacks;
     std::vector<std::pair<CallbackHandle, TimeChangeCallback>> _deltaTimeChangeCallbacks;
+    std::vector<std::pair<CallbackHandle, TimeChangeCallback>> _deltaTimeStepsChangeCallbacks;
 
     std::vector<std::pair<CallbackHandle, TimeChangeCallback>> _timeJumpCallbacks;
     std::vector<std::pair<CallbackHandle, TimeChangeCallback>> _timelineChangeCallbacks;

modules/server/CMakeLists.txt

@@ -33,6 +33,7 @@ set(HEADER_FILES
   include/serverinterface.h
   include/topics/authorizationtopic.h
   include/topics/bouncetopic.h
+  include/topics/deltatimestepstopic.h
   include/topics/documentationtopic.h
   include/topics/flightcontrollertopic.h
   include/topics/getpropertytopic.h
@@ -56,6 +57,7 @@ set(SOURCE_FILES
   src/serverinterface.cpp
   src/topics/authorizationtopic.cpp
   src/topics/bouncetopic.cpp
+  src/topics/deltatimestepstopic.cpp
   src/topics/documentationtopic.cpp
   src/topics/flightcontrollertopic.cpp
   src/topics/getpropertytopic.cpp

modules/server/include/topics/deltatimestepstopic.h

@@ -0,0 +1,57 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2020                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_MODULE_SERVER___DELTA_TIME_STEPS_TOPIC___H__
+#define __OPENSPACE_MODULE_SERVER___DELTA_TIME_STEPS_TOPIC___H__
+
+#include <modules/server/include/topics/topic.h>
+#include <optional>
+
+namespace openspace {
+
+class DeltaTimeStepsTopic : public Topic {
+public:
+    DeltaTimeStepsTopic();
+    virtual ~DeltaTimeStepsTopic();
+
+    void handleJson(const nlohmann::json& json) override;
+    bool isDone() const override;
+
+private:
+    const int UnsetOnChangeHandle = -1;
+
+    bool dataHasChanged();
+    void sendDeltaTimesData();
+
+    int _deltaTimeCallbackHandle = UnsetOnChangeHandle;
+    int _deltaTimesListCallbackHandle = UnsetOnChangeHandle;
+    bool _isDone = false;
+
+    std::optional<double> _lastNextDeltaTime = std::nullopt;
+    std::optional<double> _lastPrevDeltaTime = std::nullopt;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_MODULE_SERVER___DELTA_TIME_STEPS_TOPIC___H__

modules/server/src/connection.cpp

@@ -26,6 +26,7 @@
 
 #include <modules/server/include/topics/authorizationtopic.h>
 #include <modules/server/include/topics/bouncetopic.h>
+#include <modules/server/include/topics/deltatimestepstopic.h>
 #include <modules/server/include/topics/documentationtopic.h>
 #include <modules/server/include/topics/flightcontrollertopic.h>
 #include <modules/server/include/topics/getpropertytopic.h>
@@ -56,6 +57,7 @@ namespace {
 
     constexpr const char* VersionTopicKey = "version";
     constexpr const char* AuthenticationTopicKey = "authorize";
+    constexpr const char* DeltaTimeStepsTopicKey = "deltatimesteps";
     constexpr const char* DocumentationTopicKey = "documentation";
     constexpr const char* GetPropertyTopicKey = "get";
     constexpr const char* LuaScriptTopicKey = "luascript";
@@ -95,6 +97,7 @@ Connection::Connection(std::unique_ptr<ghoul::io::Socket> s,
     );
 
     _topicFactory.registerClass<DocumentationTopic>(DocumentationTopicKey);
+    _topicFactory.registerClass<DeltaTimeStepsTopic>(DeltaTimeStepsTopicKey);
     _topicFactory.registerClass<GetPropertyTopic>(GetPropertyTopicKey);
     _topicFactory.registerClass<LuaScriptTopic>(LuaScriptTopicKey);
     _topicFactory.registerClass<SessionRecordingTopic>(SessionRecordingTopicKey);

modules/server/src/topics/deltatimestepstopic.cpp

@@ -0,0 +1,127 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2020                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include "modules/server/include/topics/deltatimestepstopic.h"
+
+#include <modules/server/include/connection.h>
+#include <openspace/engine/globals.h>
+#include <openspace/properties/property.h>
+#include <openspace/query/query.h>
+#include <openspace/util/timemanager.h>
+#include <ghoul/logging/logmanager.h>
+
+namespace {
+    constexpr const char* EventKey = "event";
+    constexpr const char* SubscribeEvent = "start_subscription";
+    constexpr const char* UnsubscribeEvent = "stop_subscription";
+} // namespace
+
+using nlohmann::json;
+
+namespace openspace {
+
+DeltaTimeStepsTopic::DeltaTimeStepsTopic() {}
+
+DeltaTimeStepsTopic::~DeltaTimeStepsTopic() {
+    if (_deltaTimeCallbackHandle != UnsetOnChangeHandle) {
+        global::timeManager.removeDeltaTimeChangeCallback(
+            _deltaTimeCallbackHandle
+        );
+    }
+    if (_deltaTimesListCallbackHandle != UnsetOnChangeHandle) {
+        global::timeManager.removeDeltaTimeStepsChangeCallback(
+            _deltaTimesListCallbackHandle
+        );
+    }
+}
+
+bool DeltaTimeStepsTopic::isDone() const {
+    return _isDone;
+}
+
+bool DeltaTimeStepsTopic::dataHasChanged() {
+    std::optional<double> nextStep = global::timeManager.nextDeltaTimeStep();
+    std::optional<double> prevStep = global::timeManager.previousDeltaTimeStep();
+
+    return (nextStep != _lastNextDeltaTime || prevStep != _lastPrevDeltaTime);
+}
+
+void DeltaTimeStepsTopic::handleJson(const nlohmann::json& json) {
+    std::string event = json.at(EventKey).get<std::string>();
+    if (event == UnsubscribeEvent) {
+        _isDone = true;
+        return;
+    }
+
+    sendDeltaTimesData();
+
+    if (event != SubscribeEvent) {
+        _isDone = true;
+        return;
+    }
+
+    _deltaTimeCallbackHandle = global::timeManager.addDeltaTimeChangeCallback(
+        [this]() {
+            if (dataHasChanged()) {
+                sendDeltaTimesData();
+            }
+        }
+    );
+
+    _deltaTimesListCallbackHandle = global::timeManager.addDeltaTimeStepsChangeCallback(
+        [this]() {
+            if (dataHasChanged()) {
+                sendDeltaTimesData();
+            }
+        }
+    );
+}
+
+void DeltaTimeStepsTopic::sendDeltaTimesData() {
+    std::optional<double> nextStep = global::timeManager.nextDeltaTimeStep();
+    std::optional<double> prevStep = global::timeManager.previousDeltaTimeStep();
+
+    bool hasNext = nextStep.has_value();
+    bool hasPrev = prevStep.has_value();
+
+    json deltaTimesListJson = {
+        { "hasNextStep", hasNext },
+        { "hasPrevStep", hasPrev }
+    };
+
+    if (hasNext) {
+        deltaTimesListJson["nextStep"] = nextStep.value();
+    }
+
+    if (hasPrev) {
+        deltaTimesListJson["prevStep"] = prevStep.value();
+    }
+
+    _connection->sendJson(wrappedPayload(deltaTimesListJson));
+
+    _lastNextDeltaTime = nextStep;
+    _lastPrevDeltaTime = prevStep;
+}
+
+} // namespace openspace

src/rendering/renderengine.cpp

@@ -1368,6 +1368,28 @@ void RenderEngine::renderVersionInformation() {
             glm::vec4(0.5, 0.5, 0.5, 1.f)
         );
     }
+
+#ifdef TRACY_ENABLE
+    {
+        // If we have Tracy enabled, we should inform the user about it that the
+        // application will crash after a while if no profiler is attached
+
+        ZoneScopedN("Tracy Information")
+
+        const glm::vec2 tracyBox = _fontInfo->boundingBox("TRACY PROFILING ENABLED");
+        const glm::vec2 penPosition = glm::vec2(
+            fontResolution().x - tracyBox.x - 10.f,
+            versionBox.y + commitBox.y + 5.f
+        );
+        FR::defaultRenderer().render(
+            *_fontInfo,
+            penPosition,
+            "TRACY PROFILING ENABLED",
+            glm::vec4(0.8f, 0.2f, 0.15f, 1.f)
+        );
+    }
+#endif // TRACY_ENABLE
+
 }
 
 void RenderEngine::renderScreenLog() {

src/scene/assetloader.cpp

@@ -191,12 +191,6 @@ void AssetLoader::setUpAssetLuaTable(Asset* asset) {
     lua_pushcclosure(*_luaState, &assetloader::require, 1);
     lua_setfield(*_luaState, assetTableIndex, RequireFunctionName);
 
-    // Register request function
-    // Dependency request(string path)
-    lua_pushlightuserdata(*_luaState, asset);
-    lua_pushcclosure(*_luaState, &assetloader::request, 1);
-    lua_setfield(*_luaState, assetTableIndex, RequestFunctionName);
-
     // Register exists function
     // bool exists(string path)
     lua_pushlightuserdata(*_luaState, asset);
@@ -473,14 +467,6 @@ int AssetLoader::onDeinitializeDependencyLua(Asset* dependant, Asset* dependency
     return 0;
 }
 
-std::shared_ptr<Asset> AssetLoader::request(const std::string& identifier) {
-    std::shared_ptr<Asset> asset = getAsset(identifier);
-    Asset* parent = _currentAsset;
-    parent->request(asset);
-    assetRequested(parent, asset);
-    return asset;
-}
-
 void AssetLoader::unrequest(const std::string& identifier) {
     std::shared_ptr<Asset> asset = has(identifier);
     Asset* parent = _currentAsset;
@@ -501,7 +487,11 @@ std::shared_ptr<Asset> AssetLoader::add(const std::string& identifier) {
     ZoneScoped
 
     setCurrentAsset(_rootAsset.get());
-    return request(identifier);
+    std::shared_ptr<Asset> asset = getAsset(identifier);
+    Asset* parent = _currentAsset;
+    parent->request(asset);
+    assetRequested(parent, asset);
+    return asset;
 }
 
 void AssetLoader::remove(const std::string& identifier) {
@@ -714,32 +704,6 @@ int AssetLoader::requireLua(Asset* dependant) {
     return 2;
 }
 
-int AssetLoader::requestLua(Asset* parent) {
-    ghoul::lua::checkArgumentsAndThrow(*_luaState, 1, "lua::request");
-
-    const std::string assetName = luaL_checkstring(*_luaState, 1);
-    lua_settop(*_luaState, 0);
-
-    std::shared_ptr<Asset> child = request(assetName);
-
-    addLuaDependencyTable(parent, child.get());
-
-    // Get the dependency table
-    lua_rawgeti(*_luaState, LUA_REGISTRYINDEX, _assetsTableRef);
-    lua_getfield(*_luaState, -1, child->id().c_str());
-    lua_getfield(*_luaState, -1, DependantsTableName);
-    lua_getfield(*_luaState, -1, parent->id().c_str());
-    const int dependencyTableIndex = lua_gettop(*_luaState);
-
-    lua_pushvalue(*_luaState, dependencyTableIndex);
-
-    lua_replace(*_luaState, 1);
-    lua_settop(*_luaState, 1);
-
-    ghoul_assert(lua_gettop(*_luaState) == 1, "Incorrect number of items left on stack");
-    return 1;
-}
-
 int AssetLoader::existsLua(Asset*) {
     ghoul::lua::checkArgumentsAndThrow(*_luaState, 1, "lua::exists");
 

src/scene/assetloader_lua.inl

@@ -71,7 +71,7 @@ int onDeinitializeDependency(lua_State* state) {
 }
 
 /**
- * Requires rependency
+ * Requires dependency
  * Gives access to
  *   AssetTable: Exported lua values
  *   Dependency: ...
@@ -82,17 +82,6 @@ int require(lua_State* state) {
     return asset->loader()->requireLua(asset);
 }
 
-/**
- * Requests rependency
- * Gives access to
- *   Dependency: ...
- * Usage: Dependency = asset.import(string assetIdentifier)
- */
-int request(lua_State* state) {
-    Asset* asset = reinterpret_cast<Asset*>(lua_touserdata(state, lua_upvalueindex(1)));
-    return asset->loader()->requestLua(asset);
-}
-
 int exists(lua_State* state) {
     Asset* asset = reinterpret_cast<Asset*>(lua_touserdata(state, lua_upvalueindex(1)));
     return asset->loader()->existsLua(asset);

src/scene/profile.cpp

@@ -45,6 +45,7 @@ namespace {
     constexpr const char* headerProperty = "#Property";
     constexpr const char* headerKeybinding = "#Keybinding";
     constexpr const char* headerTime = "#Time";
+    constexpr const char* headerDeltaTimes = "#DeltaTimes";
     constexpr const char* headerCamera = "#Camera";
     constexpr const char* headerMarkNodes = "#MarkNodes";
     constexpr const char* headerAdditionalScripts = "#AdditionalScripts";
@@ -91,6 +92,7 @@ namespace {
         Property,
         Keybinding,
         Time,
+        DeltaTimes,
         Camera,
         MarkNodes,
         AdditionalScripts
@@ -104,6 +106,7 @@ namespace {
         if (line == headerProperty) { return Section::Property; }
         if (line == headerKeybinding) { return Section::Keybinding; }
         if (line == headerTime) { return Section::Time; }
+        if (line == headerDeltaTimes) { return Section::DeltaTimes; }
         if (line == headerCamera) { return Section::Camera; }
         if (line == headerMarkNodes) { return Section::MarkNodes; }
         if (line == headerAdditionalScripts) { return Section::AdditionalScripts; }
@@ -318,6 +321,18 @@ namespace {
         return time;
     }
 
+    [[ nodiscard ]] double parseDeltaTime(const std::string& line, int lineNumber) {
+        try {
+            return std::stod(line);
+        }
+        catch (const std::invalid_argument&) {
+            throw ProfileParsingError(
+                lineNumber,
+                fmt::format("Expected a number for delta time entry, got '{}'", line)
+            );
+        }
+    }
+
     [[ nodiscard ]] Profile::CameraType parseCamera(const std::string& line, int lineNumber) {
         std::vector<std::string> fields = ghoul::tokenizeString(line, '\t');
         Profile::CameraType camera = [&](const std::string& type) ->
@@ -480,6 +495,10 @@ void Profile::saveCurrentSettingsToProfile(const properties::PropertyOwner& root
     t.type = Time::Type::Absolute;
     time = std::move(t);
 
+    // Delta times
+    std::vector<double> dts = global::timeManager.deltaTimeSteps();
+    deltaTimes = std::move(dts);
+
     // Camera
 
     CameraNavState c;
@@ -652,6 +671,13 @@ std::string Profile::serialize() const {
         }
     }
 
+    if (!deltaTimes.empty()) {
+        output += fmt::format("\n{}\n", headerDeltaTimes);
+        for (const double d : deltaTimes) {
+            output += fmt::format("{}\n", d);
+        }
+    }
+
     if (camera.has_value()) {
         output += fmt::format("\n{}\n", headerCamera);
         output += std::visit(
@@ -874,6 +900,12 @@ Profile::Profile(const std::vector<std::string>& content) {
                 time = parseTime(line, lineNum);
                 foundTime = true;
                 break;
+            case Section::DeltaTimes:
+            {
+                const double d = parseDeltaTime(line, lineNum);
+                deltaTimes.push_back(d);
+                break;
+            }
             case Section::Camera:
                 if (foundCamera) {
                     throw ProfileParsingError(
@@ -985,11 +1017,20 @@ std::string Profile::convertToScene() const {
             throw ghoul::MissingCaseException();
     }
 
+    // Delta Times
+    {
+        std::string times;
+        for (const double d : deltaTimes) {
+            times += fmt::format("{} ,", d);
+        }
+        output += fmt::format("openspace.time.setDeltaTimeSteps({{ {} }});\n", times);
+    }
+
     // Mark Nodes
     {
         std::string nodes;
         for (const std::string& n : markNodes) {
-            nodes += fmt::format("[[ {} ]],", n);
+            nodes += fmt::format("[[{}]],", n);
         }
         output += fmt::format("openspace.markInterestingNodes({{ {} }});\n", nodes);
     }

src/util/time.cpp

@@ -143,6 +143,16 @@ scripting::LuaLibrary Time::luaLibrary() {
                 "Sets the amount of simulation time that happens "
                 "in one second of real time"
             },
+            {
+                "setDeltaTimeSteps",
+                &luascriptfunctions::time_setDeltaTimeSteps,
+                {},
+                "List of numbers",
+                "Sets the list of discrete delta time steps for the simulation speed "
+                "that can be quickly jumped between. The list will be sorted to be in "
+                "increasing order. A negative verison of each specified time step will "
+                "be added per default as well."
+            },
             {
                 "deltaTime",
                 &luascriptfunctions::time_deltaTime,
@@ -183,31 +193,74 @@ scripting::LuaLibrary Time::luaLibrary() {
                 &luascriptfunctions::time_interpolateTimeRelative,
                 {},
                 "number [, number]",
-                "Increments the current simulation time "
-                "by the specified number of seconds."
+                "Increments the current simulation time by the specified number of "
+                "seconds. If a second input value is given, the interpolation is done "
+                "over the specified number of seconds."
             },
             {
                 "interpolateDeltaTime",
                 &luascriptfunctions::time_interpolateDeltaTime,
                 {},
-                "number",
-                "Sets the amount of simulation time that happens "
-                "in one second of real time"
+                "number [, number]",
+                "Sets the amount of simulation time that happens in one second of real "
+                "time. If a second input value is given, the interpolation is done "
+                "over the specified number of seconds."
+            },
+            {
+                "setNextDeltaTimeStep",
+                &luascriptfunctions::time_setNextDeltaTimeStep,
+                {},
+                "",
+                "Immediately set the simulation speed to the first delta time step in "
+                "the list that is larger than the current choice of simulation speed, "
+                "if any."
+            },
+            {
+                "setPreviousDeltaTimeStep",
+                &luascriptfunctions::time_setPreviousDeltaTimeStep,
+                {},
+                "",
+                "Immediately set the simulation speed to the first delta time step in "
+                "the list that is smaller than the current choice of simulation speed. "
+                "if any."
+            },
+            {
+                "interpolateNextDeltaTimeStep",
+                &luascriptfunctions::time_interpolateNextDeltaTimeStep,
+                {},
+                "[number]",
+                "Interpolate the simulation speed to the first delta time step in the "
+                "list that is larger than the current simulation speed, if any. If an "
+                "input value is given, the interpolation is done over the specified "
+                "number of seconds."
+            },
+            {
+                "interpolatePreviousDeltaTimeStep",
+                &luascriptfunctions::time_interpolatePreviousDeltaTimeStep,
+                {},
+                "[number]",
+                "Interpolate the simulation speed to the first delta time step in the "
+                "list that is smaller than the current simulation speed, if any. If an "
+                "input value is given, the interpolation is done over the specified "
+                "number of seconds."
             },
             {
                 "interpolatePause",
                 &luascriptfunctions::time_interpolatePause,
                 {},
-                "bool",
-                "Pauses the simulation time or restores the delta time"
+                "bool [, number]",
+                "Pauses the simulation time or restores the delta time. If a second "
+                "input value is given, the interpolation is done over the specified "
+                "number of seconds."
             },
             {
                 "interpolateTogglePause",
                 &luascriptfunctions::time_interpolateTogglePause,
                 {},
-                "",
+                "[number]",
                 "Toggles the pause function, i.e. temporarily setting the delta time to 0"
-                " and restoring it afterwards"
+                " and restoring it afterwards. If an input value is given, the "
+                "interpolation is done over the specified number of seconds."
             },
             {
                 "currentTime",

src/util/time_lua.inl

@@ -69,6 +69,156 @@ int time_setDeltaTime(lua_State* L) {
     return 0;
 }
 
+/**
+ * \ingroup LuaScripts
+* interpolateNextDeltaTimeStep(list of numbers):
+* Sets the list of discrete delta time steps for the simulation speed.
+ */
+int time_setDeltaTimeSteps(lua_State* L) {
+    ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::time_setDeltaTimeSteps");
+
+    ghoul::Dictionary dict;
+    ghoul::lua::luaDictionaryFromState(L, dict);
+    const size_t nItems = dict.size();
+
+    std::vector<double> inputDeltaTimes;
+    inputDeltaTimes.reserve(nItems);
+
+    for (size_t i = 1; i <= nItems; ++i) {
+        std::string key = std::to_string(i);
+        if (dict.hasKeyAndValue<double>(key)) {
+            const double time = dict.value<double>(key);
+            inputDeltaTimes.push_back(time);
+        }
+        else {
+            const char* msg = lua_pushfstring(L,
+                "Error setting delta times. Expected list of numbers.");
+            return ghoul::lua::luaError(L, fmt::format("bad argument ({})", msg));
+        }
+    }
+    lua_pop(L, 1);
+
+    global::timeManager.setDeltaTimeSteps(inputDeltaTimes);
+
+    lua_settop(L, 0);
+    ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
+    return 0;
+}
+
+/**
+ * \ingroup LuaScripts
+* setNextDeltaTimeStep():
+* Immediately set the simulation speed to the first delta time step in the list that is 
+* larger than the current choice of simulation speed, if any.
+ */
+int time_setNextDeltaTimeStep(lua_State* L) {
+    ghoul::lua::checkArgumentsAndThrow(L, 0, "lua::time_setNextDeltaTimeStep");
+
+    global::timeManager.setNextDeltaTimeStep();
+
+    lua_settop(L, 0);
+    ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
+    return 0;
+}
+
+/**
+ * \ingroup LuaScripts
+* setPreviousDeltaTimeStep():
+* Immediately set the simulation speed to the first delta time step in the list that is
+* smaller than the current choice of simulation speed, if any.
+ */
+int time_setPreviousDeltaTimeStep(lua_State* L) {
+    ghoul::lua::checkArgumentsAndThrow(L, 0, "lua::time_setPreviousDeltaTimeStep");
+
+    global::timeManager.setPreviousDeltaTimeStep();
+
+    lua_settop(L, 0);
+    ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
+    return 0;
+}
+
+/**
+ * \ingroup LuaScripts
+* interpolateNextDeltaTimeStep([interpolationDuration]):
+* Interpolate the simulation speed to the next delta time step in the list. If an input
+* value is given, the interpolation is done over the specified number of seconds.
+* If interpolationDuration is not provided, the interpolation time will be based on the
+* `defaultDeltaTimeInterpolationDuration` property of the TimeManager.
+ */
+int time_interpolateNextDeltaTimeStep(lua_State* L) {
+    ghoul::lua::checkArgumentsAndThrow(
+        L, 
+        { 0, 1 }, 
+        "lua::time_interpolateNextDeltaTimeStep"
+    );
+
+    double interpolationDuration = 
+        global::timeManager.defaultDeltaTimeInterpolationDuration();
+
+    const int nArguments = lua_gettop(L);
+    if (nArguments == 1) {
+        const bool durationIsNumber = (lua_isnumber(L, 1) != 0);
+        if (!durationIsNumber) {
+            lua_settop(L, 0);
+            const char* msg = lua_pushfstring(
+                L,
+                "%s expected, got %s",
+                lua_typename(L, LUA_TNUMBER),
+                luaL_typename(L, -1)
+            );
+            return luaL_error(L, "bad argument #%d (%s)", 1, msg);
+        }
+        interpolationDuration = lua_tonumber(L, 1);
+    }
+
+    global::timeManager.interpolateNextDeltaTimeStep(interpolationDuration);
+
+    lua_settop(L, 0);
+    ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
+    return 0;
+}
+
+/**
+ * \ingroup LuaScripts
+* interpolatePreviousDeltaTimeStep([interpolationDuration]):
+* Interpolate the simulation speed to the previous delta time step in the list. If an 
+* input value is given, the interpolation is done over the specified number of seconds.
+* If interpolationDuration is not provided, the interpolation time will be based on the
+* `defaultDeltaTimeInterpolationDuration` property of the TimeManager.
+ */
+int time_interpolatePreviousDeltaTimeStep(lua_State* L) {
+    ghoul::lua::checkArgumentsAndThrow(
+        L, 
+        { 0, 1 }, 
+        "lua::time_interpolatePreviousDeltaTimeStep"
+    );
+
+    double interpolationDuration = 
+        global::timeManager.defaultDeltaTimeInterpolationDuration();
+
+    const int nArguments = lua_gettop(L);
+    if (nArguments == 1) {
+        const bool durationIsNumber = (lua_isnumber(L, 1) != 0);
+        if (!durationIsNumber) {
+            lua_settop(L, 0);
+            const char* msg = lua_pushfstring(
+                L,
+                "%s expected, got %s",
+                lua_typename(L, LUA_TNUMBER),
+                luaL_typename(L, -1)
+            );
+            return luaL_error(L, "bad argument #%d (%s)", 1, msg);
+        }
+        interpolationDuration = lua_tonumber(L, 1);
+    }
+
+    global::timeManager.interpolatePreviousDeltaTimeStep(interpolationDuration);
+
+    lua_settop(L, 0);
+    ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
+    return 0;
+}
+
 /**
 * \ingroup LuaScripts
 * time_interpolateDeltaTime(number [, number]):

src/util/timemanager.cpp

@@ -159,6 +159,13 @@ void TimeManager::preSynchronization(double dt) {
             it.second();
         }
     }
+    if (_deltaTimeStepsChanged) {
+        using K = const CallbackHandle;
+        using V = TimeChangeCallback;
+        for (const std::pair<K, V>& it : _deltaTimeStepsChangeCallbacks) {
+            it.second();
+        }
+    }
     if (_timelineChanged) {
         ZoneScopedN("timeline changed")
         using K = const CallbackHandle;
@@ -173,6 +180,7 @@ void TimeManager::preSynchronization(double dt) {
     _lastDeltaTime = _deltaTime;
     _lastTargetDeltaTime = _targetDeltaTime;
     _lastTimePaused = _timePaused;
+    _deltaTimeStepsChanged = false;
     _timelineChanged = false;
 }
 
@@ -386,6 +394,26 @@ void TimeManager::setDeltaTime(double deltaTime) {
     interpolateDeltaTime(deltaTime, 0.0);
 }
 
+void TimeManager::setDeltaTimeSteps(std::vector<double> deltaTimes) {
+    std::vector<double> negatives;
+    negatives.reserve(deltaTimes.size());
+    std::transform(
+        deltaTimes.begin(), 
+        deltaTimes.end(), 
+        std::back_inserter(negatives),
+        [](double d) { return -d; }
+    );
+
+    deltaTimes.reserve(2 * deltaTimes.size());
+    deltaTimes.insert(deltaTimes.end(), negatives.begin(), negatives.end());
+
+    std::sort(deltaTimes.begin(), deltaTimes.end());
+    deltaTimes.erase(std::unique(deltaTimes.begin(), deltaTimes.end()), deltaTimes.end());
+
+    _deltaTimeSteps = std::move(deltaTimes);
+    _deltaTimeStepsChanged = true;
+}
+
 size_t TimeManager::nKeyframes() const {
     return _timeline.nKeyframes();
 }
@@ -419,6 +447,14 @@ TimeManager::CallbackHandle TimeManager::addDeltaTimeChangeCallback(TimeChangeCa
     return handle;
 }
 
+TimeManager::CallbackHandle 
+TimeManager::addDeltaTimeStepsChangeCallback(TimeChangeCallback cb)
+{
+    CallbackHandle handle = _nextCallbackHandle++;
+    _deltaTimeStepsChangeCallbacks.emplace_back(handle, std::move(cb));
+    return handle;
+}
+
 TimeManager::CallbackHandle TimeManager::addTimeJumpCallback(TimeChangeCallback cb) {
     CallbackHandle handle = _nextCallbackHandle++;
     _timeJumpCallbacks.emplace_back(handle, std::move(cb));
@@ -466,6 +502,23 @@ void TimeManager::removeDeltaTimeChangeCallback(CallbackHandle handle) {
     _deltaTimeChangeCallbacks.erase(it);
 }
 
+void TimeManager::removeDeltaTimeStepsChangeCallback(CallbackHandle handle) {
+    const auto it = std::find_if(
+        _deltaTimeStepsChangeCallbacks.begin(),
+        _deltaTimeStepsChangeCallbacks.end(),
+        [handle](const std::pair<CallbackHandle, std::function<void()>>& cb) {
+            return cb.first == handle;
+        }
+    );
+
+    ghoul_assert(
+        it != _deltaTimeStepsChangeCallbacks.end(),
+        "handle must be a valid callback handle"
+    );
+
+    _deltaTimeStepsChangeCallbacks.erase(it);
+}
+
 void TimeManager::triggerPlaybackStart() {
     _playbackModeEnabled = true;
 }
@@ -532,6 +585,10 @@ double TimeManager::targetDeltaTime() const {
     return _targetDeltaTime;
 }
 
+std::vector<double> TimeManager::deltaTimeSteps() const {
+    return _deltaTimeSteps;
+}
+
 void TimeManager::interpolateDeltaTime(double newDeltaTime, double interpolationDuration)
 {
     if (newDeltaTime == _targetDeltaTime) {
@@ -559,6 +616,79 @@ void TimeManager::interpolateDeltaTime(double newDeltaTime, double interpolation
     addKeyframe(now + interpolationDuration, futureKeyframe);
 }
 
+std::optional<double> TimeManager::nextDeltaTimeStep() {
+    if (!hasNextDeltaTimeStep()) {
+        return std::nullopt;
+    }
+    std::vector<double>::iterator nextStepIterator = std::upper_bound(
+        _deltaTimeSteps.begin(),
+        _deltaTimeSteps.end(),
+        _targetDeltaTime
+    );
+
+    if (nextStepIterator == _deltaTimeSteps.end()) {
+        return std::nullopt; // should not get here
+    }
+
+    return *nextStepIterator;
+}
+
+std::optional<double> TimeManager::previousDeltaTimeStep() {
+    if (!hasPreviousDeltaTimeStep()) {
+        return std::nullopt;
+    }
+    std::vector<double>::iterator lowerBoundIterator = std::lower_bound(
+        _deltaTimeSteps.begin(),
+        _deltaTimeSteps.end(),
+        _targetDeltaTime
+    );
+
+    if (lowerBoundIterator == _deltaTimeSteps.begin()) {
+        return std::nullopt; // should not get here
+    }
+
+    std::vector<double>::iterator prevStepIterator = lowerBoundIterator - 1;
+    return *prevStepIterator;
+}
+
+bool TimeManager::hasNextDeltaTimeStep() const {
+    if (_deltaTimeSteps.empty())
+        return false;
+
+    return _targetDeltaTime < _deltaTimeSteps.back();
+}
+
+bool TimeManager::hasPreviousDeltaTimeStep() const {
+    if (_deltaTimeSteps.empty())
+        return false;
+
+    return _targetDeltaTime > _deltaTimeSteps.front();
+}
+
+void TimeManager::setNextDeltaTimeStep() {
+    interpolateNextDeltaTimeStep(0);
+}
+
+void TimeManager::setPreviousDeltaTimeStep() {
+    interpolatePreviousDeltaTimeStep(0);
+}
+
+void TimeManager::interpolateNextDeltaTimeStep(double durationSeconds) {
+    if (!hasNextDeltaTimeStep()) 
+        return;
+
+    double nextDeltaTime = nextDeltaTimeStep().value();
+    interpolateDeltaTime(nextDeltaTime, durationSeconds);
+}
+
+void TimeManager::interpolatePreviousDeltaTimeStep(double durationSeconds) {
+    if (!hasPreviousDeltaTimeStep())
+        return;
+
+    double previousDeltaTime = previousDeltaTimeStep().value();
+    interpolateDeltaTime(previousDeltaTime, durationSeconds);
+}
+
 void TimeManager::setPause(bool pause) {
     interpolatePause(pause, 0);
 }

support/cmake/handle_modules.cmake

@@ -143,7 +143,7 @@ function (handle_modules internal_module_path external_modules_paths)
         # Only link openspace-core against the library if it has been set STATIC
         get_target_property(library_type ${library_name} TYPE)
         if (NOT ${library_type} STREQUAL "SHARED_LIBRARY")
-            target_link_libraries(openspace-core ${library_name})
+            target_link_libraries(openspace-core PUBLIC ${library_name})
         endif()
 
         create_define_name(${name} define_name)

tests/profile/basic_deltatimes.profile

@@ -0,0 +1,9 @@
+#Version
+12.13
+
+#DeltaTimes
+1.0
+30.0
+60.0
+1000.0
+36000.0

tests/profile/error_deltatimes_wrong_parameter_value_type.profile

@@ -0,0 +1,8 @@
+#Version
+12.13
+
+#DeltaTimes
+1
+10
+notANumber
+200

tests/test_profile.cpp

@@ -168,6 +168,16 @@ TEST_CASE("Basic Time Absolute", "[profile]") {
     REQUIRE(serialized == contents);
 }
 
+TEST_CASE("Basic Delta Times", "[profile]") {
+    constexpr const char* TestFile = "${TESTDIR}/profile/basic_deltatimes.profile";
+    Profile p = loadProfile(TestFile);
+
+    std::string serialized = p.serialize();
+    std::string contents = loadFile(TestFile);
+
+    REQUIRE(serialized == contents);
+}
+
 TEST_CASE("Basic Camera NavState", "[profile]") {
     constexpr const char* TestFile = "${TESTDIR}/profile/basic_camera_navstate.profile";
     Profile p = loadProfile(TestFile);
@@ -691,6 +701,17 @@ TEST_CASE("Error time wrong parameter type 'type'", "[profile]") {
     );
 }
 
+TEST_CASE("Error deltatimes wrong parameter type", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error_deltatimes_wrong_parameter_value_type.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains(
+            "Expected a number for delta time entry, got 'notANumber'" 
+        )
+    );
+}
+
 TEST_CASE("Error camera navigation state too few parameters", "[profile]") {
     constexpr const char* TestFile =
         "${TESTDIR}/profile/error_camera_navstate_too_few_parameters.profile";