Merge branch 'thesis/2019/camera-paths' into camera-paths/avoid-collision

data/assets/asteroids.scene

@@ -0,0 +1,34 @@
+asset.require('./base')
+
+local earthAsset = asset.require('scene/solarsystem/planets/earth/earth')
+
+asset.require('scene/solarsystem/sssb/amor_asteroid')
+asset.require('scene/solarsystem/sssb/apollo_asteroid')
+asset.require('scene/solarsystem/sssb/aten_asteroid')
+asset.require('scene/solarsystem/sssb/atira_asteroid')
+asset.require('scene/solarsystem/sssb/centaur_asteroid')
+asset.require('scene/solarsystem/sssb/chiron-type_comet')
+asset.require('scene/solarsystem/sssb/encke-type_comet')
+asset.require('scene/solarsystem/sssb/halley-type_comet')
+asset.require('scene/solarsystem/sssb/inner_main_belt_asteroid')
+asset.require('scene/solarsystem/sssb/jupiter_trojan_asteroid')
+asset.require('scene/solarsystem/sssb/jupiter-family_comet')
+asset.require('scene/solarsystem/sssb/main_belt_asteroid')
+asset.require('scene/solarsystem/sssb/mars-crossing_asteroid')
+asset.require('scene/solarsystem/sssb/outer_main_belt_asteroid')
+asset.require('scene/solarsystem/sssb/transneptunian_object_asteroid')
+asset.require('scene/solarsystem/sssb/pha')
+
+asset.onInitialize(function ()
+    local now = openspace.time.currentWallTime()
+    -- Jump back one day to be able to show complete weather data on Earth.
+    openspace.time.setTime(openspace.time.advancedTime(now, "-1d"))
+
+    openspace.globebrowsing.goToGeo("Earth", 58.5877, 16.1924, 2.7e12)
+
+    openspace.markInterestingNodes({ "Earth", "Mars", "Moon", "Sun" })
+end)
+
+asset.onDeinitialize(function ()
+    openspace.removeInterestingNodes({ "Earth", "Mars", "Moon", "Sun" })
+end)

data/assets/default.scene

@@ -2,7 +2,6 @@ asset.require('./base')
 
 local earthAsset = asset.require('scene/solarsystem/planets/earth/earth')
 asset.require('scene/solarsystem/planets/earth/satellites/satellites.asset')
-asset.require('scene/solarsystem/sssb/pha')
 
 asset.onInitialize(function ()
     local now = openspace.time.currentWallTime()

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

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

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

@@ -1,6 +1,6 @@
-asset.request('./misc/brightest')
-asset.request('./communications/geostationary')
-asset.request('./navigation/gps')
-asset.request('./misc/spacestations')
-asset.request('./misc/iss')
-asset.request('./misc/tle-new')
+asset.require('./misc/brightest')
+asset.require('./communications/geostationary')
+asset.require('./navigation/gps')
+asset.require('./misc/spacestations')
+asset.require('./misc/iss')
+asset.require('./misc/tle-new')

data/assets/scene/solarsystem/sssb/amor_asteroid.asset

@@ -0,0 +1,10 @@
+local assetHelper = asset.require('util/asset_helper')
+local sharedSssb = asset.require('./sssb_shared')
+
+local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'amor_asteroid', 'sssb_data_amor_asteroid')
+local object = sharedSssb.createSssbGroupObject('sssb_data_amor_asteroid.csv', "Amor Asteroids", filepath, { 0.9, 0.3, 0.1 })
+object.Renderable.Enabled = false
+object.Renderable.SegmentQuality = 4
+object.Renderable.TrailFade = 11
+
+assetHelper.registerSceneGraphNodesAndExport(asset, { object })

data/assets/scene/solarsystem/sssb/apollo_asteroid.asset

@@ -0,0 +1,10 @@
+local assetHelper = asset.require('util/asset_helper')
+local sharedSssb = asset.require('./sssb_shared')
+
+local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'apollo_asteroid', 'sssb_data_apollo_asteroid')
+local object = sharedSssb.createSssbGroupObject('sssb_data_apollo_asteroid.csv', "Apollo Asteroids", filepath, { 0.9, 0.3, 0.1 })
+object.Renderable.Enabled = false
+object.Renderable.SegmentQuality = 6
+object.Renderable.TrailFade = 10
+
+assetHelper.registerSceneGraphNodesAndExport(asset, { object })

data/assets/scene/solarsystem/sssb/aten_asteroid.asset

@@ -0,0 +1,10 @@
+local assetHelper = asset.require('util/asset_helper')
+local sharedSssb = asset.require('./sssb_shared')
+
+local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'aten_asteroid', 'sssb_data_aten_asteroid')
+local object = sharedSssb.createSssbGroupObject('sssb_data_aten_asteroid.csv', "Aten Asteroids", filepath, { 0.9, 0.3, 0.1 })
+object.Renderable.Enabled = false
+object.Renderable.SegmentQuality = 2
+object.Renderable.TrailFade = 18
+
+assetHelper.registerSceneGraphNodesAndExport(asset, { object })

data/assets/scene/solarsystem/sssb/atira_asteroid.asset

@@ -0,0 +1,10 @@
+local assetHelper = asset.require('util/asset_helper')
+local sharedSssb = asset.require('./sssb_shared')
+
+local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'atira_asteroid', 'sssb_data_atira_asteroid')
+local object = sharedSssb.createSssbGroupObject('sssb_data_atira_asteroid.csv', "Atira Asteroids", filepath, { 0.9, 0.3, 0.1 })
+object.Renderable.Enabled = false
+object.Renderable.SegmentQuality = 2
+object.Renderable.TrailFade = 25
+
+assetHelper.registerSceneGraphNodesAndExport(asset, { object })

data/assets/scene/solarsystem/sssb/c2019y4atlas.asset

@@ -0,0 +1,48 @@
+local assetHelper = asset.require('util/asset_helper')
+local sunTransforms = asset.require('scene/solarsystem/sun/transforms')
+
+local orbit = asset.syncedResource({
+    Name = "Comet C/2019 Y4 ATLAS",
+    Type = "HttpSynchronization",
+    Identifier = "horizons_c2019y4atlas",
+    Version = 1
+}) .. "/c2019y4atlas.txt"
+
+local C2019Y4AtlasTrail = {
+    Identifier = "C2019Y4AtlasTrail",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
+    Renderable = {
+        Type = "RenderableTrailTrajectory",
+        Translation = {
+            Type = "HorizonsTranslation",
+            HorizonsTextFile = orbit
+        },
+        Color = { 0.533333, 0.850980, 0.996078 },
+        EnableFade = false,
+        StartTime = "1950 JAN 1 0:00:00",
+        EndTime = "2100 JAN 1 00:00:00",
+        SampleInterval = 35000,
+        TimeStampSubsampleFactor = 1
+    },
+    GUI = {
+        Name = "C2019 Y4 Atlas Trail",
+        Path = "/Solar System/Comets"
+    }
+}
+
+local C2019Y4AtlasPosition = {
+    Identifier = "C2019Y4AtlasPosition",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
+    Transform = {
+        Translation = {
+            Type = "HorizonsTranslation",
+            HorizonsTextFile = orbit
+        },
+    },
+    GUI = {
+        Name = "C 2019 Y4 Atlas",
+        Path = "/Solar System/Comets"
+    }
+}
+
+assetHelper.registerSceneGraphNodesAndExport(asset, {C2019Y4AtlasPosition, C2019Y4AtlasTrail })

data/assets/scene/solarsystem/sssb/centaur_asteroid.asset

@@ -0,0 +1,10 @@
+local assetHelper = asset.require('util/asset_helper')
+local sharedSssb = asset.require('./sssb_shared')
+
+local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'centaur_asteroid', 'sssb_data_centaur_asteroid')
+local object = sharedSssb.createSssbGroupObject('sssb_data_centaur_asteroid.csv', "Centaur Asteroids", filepath, { 0.9, 0.3, 0.1 })
+object.Renderable.Enabled = false
+object.Renderable.SegmentQuality = 6
+object.Renderable.TrailFade = 18
+
+assetHelper.registerSceneGraphNodesAndExport(asset, { object })

data/assets/scene/solarsystem/sssb/chiron-type_comet.asset

@@ -0,0 +1,10 @@
+local assetHelper = asset.require('util/asset_helper')
+local sharedSssb = asset.require('./sssb_shared')
+
+local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'chiron-type_comet', 'sssb_data_chiron-type_comet')
+local object = sharedSssb.createSssbGroupObject('sssb_data_chiron-type_comet.csv', "Chiron-type Comets", filepath, { 0.9, 0.3, 0.1 })
+object.Renderable.Enabled = false
+object.Renderable.SegmentQuality = 10
+object.Renderable.TrailFade = 25
+
+assetHelper.registerSceneGraphNodesAndExport(asset, { object })

data/assets/scene/solarsystem/sssb/encke-type_comet.asset

@@ -0,0 +1,10 @@
+local assetHelper = asset.require('util/asset_helper')
+local sharedSssb = asset.require('./sssb_shared')
+
+local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'encke-type_comet', 'sssb_data_encke-type_comet')
+local object = sharedSssb.createSssbGroupObject('sssb_data_encke-type_comet.csv', "Encke-type Comets", filepath, { 0.9, 0.3, 0.1 })
+object.Renderable.Enabled = false
+object.Renderable.SegmentQuality = 2
+object.Renderable.TrailFade = 23
+
+assetHelper.registerSceneGraphNodesAndExport(asset, { object })

data/assets/scene/solarsystem/sssb/halley-type_comet.asset

@@ -0,0 +1,10 @@
+local assetHelper = asset.require('util/asset_helper')
+local sharedSssb = asset.require('./sssb_shared')
+
+local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'halley-type_comet', 'sssb_data_halley-type_comet')
+local object = sharedSssb.createSssbGroupObject('sssb_data_halley-type_comet.csv', "Halley-type Comets", filepath, { 0.9, 0.3, 0.1 })
+object.Renderable.Enabled = false
+object.Renderable.SegmentQuality = 9
+object.Renderable.TrailFade = 18
+
+assetHelper.registerSceneGraphNodesAndExport(asset, { object })

data/assets/scene/solarsystem/sssb/inner_main_belt_asteroid.asset

@@ -0,0 +1,10 @@
+local assetHelper = asset.require('util/asset_helper')
+local sharedSssb = asset.require('./sssb_shared')
+
+local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'inner_main_belt_asteroid', 'sssb_data_inner_main_belt_asteroid')
+local object = sharedSssb.createSssbGroupObject('sssb_data_inner_main_belt_asteroid.csv', "Inner Main Asteroid Belt", filepath, { 0.9, 0.3, 0.1 })
+object.Renderable.Enabled = false
+object.Renderable.SegmentQuality = 1
+object.Renderable.TrailFade = 0.5
+
+assetHelper.registerSceneGraphNodesAndExport(asset, { object })

data/assets/scene/solarsystem/sssb/jupiter-family_comet.asset

@@ -0,0 +1,10 @@
+local assetHelper = asset.require('util/asset_helper')
+local sharedSssb = asset.require('./sssb_shared')
+
+local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'jupiter-family_comet', 'sssb_data_jupiter-family_comet')
+local object = sharedSssb.createSssbGroupObject('sssb_data_jupiter-family_comet.csv', "Jupiter-family Comets", filepath, { 0.9, 0.3, 0.1 })
+object.Renderable.Enabled = false
+object.Renderable.SegmentQuality = 10
+object.Renderable.TrailFade = 28
+
+assetHelper.registerSceneGraphNodesAndExport(asset, { object })

data/assets/scene/solarsystem/sssb/jupiter_trojan_asteroid.asset

@@ -0,0 +1,10 @@
+local assetHelper = asset.require('util/asset_helper')
+local sharedSssb = asset.require('./sssb_shared')
+
+local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'jupiter_trojan_asteroid', 'sssb_data_jupiter_trojan_asteroid')
+local object = sharedSssb.createSssbGroupObject('sssb_data_jupiter_trojan_asteroid.csv', "Jupiter Trojan Asteroids", filepath, { 0.9, 0.3, 0.1 })
+object.Renderable.Enabled = false
+object.Renderable.SegmentQuality = 1
+object.Renderable.TrailFade = 5
+
+assetHelper.registerSceneGraphNodesAndExport(asset, { object })

data/assets/scene/solarsystem/sssb/main_belt_asteroid.asset

@@ -0,0 +1,11 @@
+local assetHelper = asset.require('util/asset_helper')
+local sharedSssb = asset.require('./sssb_shared')
+
+local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'main_belt_asteroid', 'sssb_data_main_belt_asteroid')
+local object = sharedSssb.createSssbGroupObject('sssb_data_main_belt_asteroid.csv', "Main Asteroid Belt", filepath, { 0.9, 0.3, 0.1 })
+object.Renderable.Enabled = false
+object.Renderable.SegmentQuality = 1
+object.Renderable.TrailFade = 0.1
+object.Renderable.UpperLimit = 50000
+
+assetHelper.registerSceneGraphNodesAndExport(asset, { object })

data/assets/scene/solarsystem/sssb/mars-crossing_asteroid.asset

@@ -0,0 +1,10 @@
+local assetHelper = asset.require('util/asset_helper')
+local sharedSssb = asset.require('./sssb_shared')
+
+local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'mars-crossing_asteroid', 'sssb_data_mars-crossing_asteroid')
+local object = sharedSssb.createSssbGroupObject('sssb_data_mars-crossing_asteroid.csv', "Mars-crossing Asteroids", filepath, { 0.9, 0.3, 0.1 })
+object.Renderable.Enabled = false
+object.Renderable.SegmentQuality = 1
+object.Renderable.TrailFade = 13
+
+assetHelper.registerSceneGraphNodesAndExport(asset, { object })

data/assets/scene/solarsystem/sssb/outer_main_belt_asteroid.asset

@@ -0,0 +1,10 @@
+local assetHelper = asset.require('util/asset_helper')
+local sharedSssb = asset.require('./sssb_shared')
+
+local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'outer_main_belt_asteroid', 'sssb_data_outer_main_belt_asteroid')
+local object = sharedSssb.createSssbGroupObject('sssb_data_outer_main_belt_asteroid.csv', "Outer Main Asteroid Belt", filepath, { 0.9, 0.3, 0.1 })
+object.Renderable.Enabled = false
+object.Renderable.SegmentQuality = 1
+object.Renderable.TrailFade = 2
+
+assetHelper.registerSceneGraphNodesAndExport(asset, { object })

data/assets/scene/solarsystem/sssb/pha.asset

@@ -2,7 +2,9 @@ local assetHelper = asset.require('util/asset_helper')
 local sharedSssb = asset.require('./sssb_shared')
 
 local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'pha', 'sssb_data_pha')
-local object = sharedSssb.createSssbGroupObject("sssb_data_pha.csv", filepath, { 0.75, 0.2, 0.2 })
+local object = sharedSssb.createSssbGroupObject('sssb_data_pha.csv', "Potentially Hazardous Asteroids", filepath, { 0.75, 0.2, 0.2 })
 object.Renderable.Enabled = false
+object.Renderable.SegmentQuality = 3
+object.Renderable.TrailFade = 17
 
 assetHelper.registerSceneGraphNodesAndExport(asset, { object })

data/assets/scene/solarsystem/sssb/sssb_shared.asset

@@ -13,7 +13,7 @@ function downloadSssbDatabaseFile(sceneAsset, name, identifier)
     })
 end
 
-local createSssbGroupObject = function(filename, sssbFolder, trailColor)
+local createSssbGroupObject = function(filename, guiName, sssbFolder, trailColor)
     assert(filename, "'filename' needs to be provided")
     assert(sssbFolder, "'sssbFolder' needs to be provided")
     trailColor = trailColor or { 0.75, 0.1, 0.1 }
@@ -27,10 +27,11 @@ local createSssbGroupObject = function(filename, sssbFolder, trailColor)
             Path = sssbFolder.."/"..filename,
             Segments = 200,
             Color = trailColor,
-            Fade = 0.5,
+            TrailFade = 0.5,
         },
         GUI = {
-            Path = "/Solar System/Small Solar System Body"
+            Path = "/Solar System/Small Bodies",
+          Name = guiName
        }
     }
 end

data/assets/scene/solarsystem/sssb/transneptunian_object_asteroid.asset

@@ -0,0 +1,10 @@
+local assetHelper = asset.require('util/asset_helper')
+local sharedSssb = asset.require('./sssb_shared')
+
+local filepath = sharedSssb.downloadSssbDatabaseFile(asset, 'transneptunian_object_asteroid', 'sssb_data_transneptunian_object_asteroid')
+local object = sharedSssb.createSssbGroupObject('sssb_data_transneptunian_object_asteroid.csv', "Transneptunian Object Asteroids", filepath, { 0.9, 0.3, 0.1 })
+object.Renderable.Enabled = false
+object.Renderable.SegmentQuality = 8
+object.Renderable.TrailFade = 10
+
+assetHelper.registerSceneGraphNodesAndExport(asset, { object })

data/assets/util/tle_helper.asset

@@ -11,7 +11,8 @@ function downloadTLEFile(sceneAsset, url, name, filename)
         Name = "Satellite TLE Data (" .. name .. ")",
         Type = "UrlSynchronization",
         Identifier = "satellite_tle_data_" .. identifier,
-        Url = url
+        Url = url,
+        Override = true
     }
 
     if (filename ~= '')  then
@@ -81,7 +82,7 @@ function satellites(title, file, color, group)
        Renderable = {
             Type = "RenderableSatellites",
             Path = file,
-            Segments = 120,
+            SegmentQuality = 3,
             Color = color,
             Fade = 1.5
         },