Commit d1cdc3d2 authored by Alexander Bock's avatar Alexander Bock
Browse files

Merge branch 'master' into feature/PerformanceATM

# Conflicts:
#	data/assets/default.scene
#	data/assets/scene/solarsystem/planets/earth/earth.asset
parents 968cbef4 ca8111dc
master content/2012EventProfile elumenati/spout-implementation elumenati/spoutImplementation feature/2012Fieldlines feature/WSA feature/apollo-missions feature/arrow-renderable feature/asset-helper feature/asset-meta-update-part2 feature/asset-require feature/atmosphere-stars-rendering feature/bufferTransferTestings feature/camera-control-during-path feature/camera-path-stability feature/cef-update feature/change-renderbin-runtime feature/cmake feature/codegen-lua feature/codegen-lua-jenkins feature/compile-times feature/direction-hint-renderable feature/downscaledATM feature/du-meshes-selection feature/fieldlines feature/gamma-correction feature/geojson feature/geojson-renderable feature/getting-started-tour feature/grid-labels feature/grids-update feature/gui-mouseinteraction-fix feature/horizons-framework feature/horizons-unit-tests feature/idle-behavior-updates feature/imageTestKeys2Actions feature/jenkins-codegen feature/jenkins-fix feature/jenkins-timeout feature/juice feature/jwst-pointing feature/jwst-trail-update feature/jwst-update feature/labels-rendering feature/location-measure feature/macos feature/mars-moons feature/mas-model feature/missions feature/model-opacity feature/molecule_rendering feature/mollwide-projection feature/multiple-endpoints feature/orientation-check feature/paper-atmosphere feature/properties-visibility feature/renderable-enabled-event feature/rover-visualization feature/satellites feature/saturn-shepherd-moons feature/science-on-the-sphere feature/sgct-framebuffer-fixes feature/sgct-gui feature/sgct-gui-editable feature/sgct-gui-jenkins feature/sgct-json feature/sgct-ui feature/side-by-side-removal feature/skybrowser feature/skybrowser-cleanup feature/skybrowser-drag-and-drop feature/skybrowser-reload feature/solarbrowsing feature/spacecraft-instruments feature/spaceweather-stream feature/spice-update feature/state-with-time feature/tileprovider-minlevel feature/tileproviders feature/tle-bodymass feature/touchEventListener feature/transparency-rendering-last feature/ubuntu2204 feature/unit-tests feature/updateTSP feature/userproperties feature/various-changes feature/video-on-globe feature/visual-testing feature/visual-testing-try2 feature/volume-fixes feature/warnings feature/wormhole feature/xbox-update hotfix/scaling integration/atm-paper-fixes-2 integration/moon-mars-show integration/paper-atmosphere issue/1043 issue/1161 issue/1279 issue/1366-2 issue/1479 issue/1559 issue/1607 issue/1666 issue/1707 issue/1751 issue/1814 issue/1827 issue/1842 issue/1845 issue/1851 issue/1905 issue/1908 issue/1910 issue/1911 issue/1964 issue/1989 issue/1995 issue/2029 issue/2055 issue/2093 issue/2111 issue/2118 issue/2121 issue/2127 issue/2133 issue/2137 issue/2194 issue/2207 issue/2209 issue/2212 issue/2236 issue/2259 issue/2261 issue/2266 issue/2269 issue/843 issue/888 issue/hdrModels jenkins/1 jenkins/2 jenkins/2286 jenkins/utah-test-1 project/2021-wisdome-installation project/climate project/exoplanet-explorer project/exoplanets-expert-tool project/lights-2020-installation project/spaceship-installation project/spvl rc/0.18.1 temp/skybrowser-animation-fixes-merge thesis/2017/mars-rover-visualization thesis/2018/data-loader thesis/2018/dsn thesis/2018/flightcontroller thesis/2018/mas-model thesis/2019/spaceDebris thesis/2019/spaceweather-stream thesis/2020/software-integration thesis/2020/sonification thesis/2021/airtraffic thesis/2021/fieldlines thesis/2021/multiuser-collab thesis/2021/multiuser-collab3 thesis/2021/skybrowser thesis/2022/climate thesis/2022/cosmic-view thesis/2022/fieldline-rendering thesis/2022/remote-streaming thesis/2022/software-integration thesis/2022/software-integration_dod thesis/2022/software-integration_receive-ra-dec thesis/2022/software-integration_refactor-simp thesis/2022/software-integration_velocity-support thesis/2022/streaming vislabs/release/2.1 research/atmospheres releases/v0.18.0 releases/v0.17.2 releases/v0.17.1 releases/v0.17.0 releases/v0.16.1 releases/v0.16.0 releases/v0.15.2 releases/v0.15.1 releases/v0.15.0 releases/v0.14.1 releases/v0.14.0 releases/v0.13.0 releases/v0.12.0 releases/beta/beta-9 releases/beta/beta-8 releases/beta/beta-7 releases/beta/beta-5 releases/beta/beta-4_2 releases/beta/beta-4 releases/beta/beta-3 releases/beta/beta-2 dev/fc-port-change beta/beta-4_2 beta/beta-4 beta/beta-3 beta/beta-2
No related merge requests found
Showing with 409 additions and 13 deletions
+409 -13
......@@ -72,8 +72,6 @@ asset.onInitialize(function ()
"Earth", "Mars", "Moon"
})
openspace.setPropertyValue("Scene.Earth.RenderableGlobe.PerformShading", false)
openspace.addVirtualProperty(
"BoolProperty",
"Show Trails",
......
......@@ -3,15 +3,15 @@
local assetHelper = asset.require("util/asset_helper")
asset.syncedResource({
Type = "UrlSynchronization",
Name = "Example Single",
Type = "UrlSynchronization",
Identifier = "example_single",
Url = "http://celestrak.com/NORAD/elements/geo.txt"
})
asset.syncedResource({
Type = "UrlSynchronization",
Name = "Example Multiple",
Type = "UrlSynchronization",
Identifier = "example_multiple",
Url = {
"http://celestrak.com/NORAD/elements/stations.txt",
......@@ -20,23 +20,23 @@ asset.syncedResource({
})
asset.syncedResource({
Type = "UrlSynchronization",
Name = "Example Large",
Type = "UrlSynchronization",
Identifier = "example_large",
Url = "http://ipv4.download.thinkbroadband.com/100MB.zip",
Override = true
})
asset.syncedResource({
Type = "UrlSynchronization",
Name = "Example Medium",
Type = "UrlSynchronization",
Identifier = "example_medium",
Url = "http://ipv4.download.thinkbroadband.com/5MB.zip",
Override = true
})
asset.syncedResource({
Type = "UrlSynchronization",
Name = "Example No ident",
Type = "UrlSynchronization",
Url = "http://ipv4.download.thinkbroadband.com/5MB.zip"
})
......@@ -145,16 +145,11 @@ local Earth = {
{
Name = "Earth at Night 2012",
FilePath = mapServiceConfigsPath .. "/GIBS/night/VIIRS_CityLights_2012.wms",
Enabled = true,
Enabled = true,
Fallback = {
Name = "Earth Night",
FilePath = texturesPath .. "/earth_night.jpg",
Enabled = true,
Settings = {
Opacity = 1.0,
Gamma = 1.5,
Multiplier = 15.0
},
}
},
{
......
local assetHelper = asset.require('util/asset_helper')
local shared = asset.require('../satellites_shared')
local group = {
Title = "Amateur Radio",
Url = "http://www.celestrak.com/NORAD/elements/amateur.txt",
TrailColor = { 0.75, 0.75, 0.35 }
}
local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
local objectNames = {}
asset.onInitialize(function ()
objectNames = shared.addSatelliteGroupObjects(group, tle, false)
end)
asset.onDeinitialize(function ()
for _, n in ipairs(objectNames) do
openspace.removeSceneGraphNode(n)
end
end)
local assetHelper = asset.require('util/asset_helper')
local shared = asset.require('../satellites_shared')
local group = {
Title = "Experimental",
Url = "http://www.celestrak.com/NORAD/elements/x-comm.txt",
TrailColor = { 0.75, 0.75, 0.35 }
}
local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
local objectNames = {}
asset.onInitialize(function ()
objectNames = shared.addSatelliteGroupObjects(group, tle, false)
end)
asset.onDeinitialize(function ()
for _, n in ipairs(objectNames) do
openspace.removeSceneGraphNode(n)
end
end)
local assetHelper = asset.require('util/asset_helper')
local shared = asset.require('../satellites_shared')
local group = {
Title = "Geostationary",
Url = "http://celestrak.com/NORAD/elements/geo.txt",
TrailColor = { 0.9, 0.9, 0.0 }
}
local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
local objectNames = {}
asset.onInitialize(function ()
objectNames = shared.addSatelliteGroupObjects(group, tle, false)
end)
asset.onDeinitialize(function ()
for _, n in ipairs(objectNames) do
openspace.removeSceneGraphNode(n)
end
end)
local assetHelper = asset.require('util/asset_helper')
local shared = asset.require('../satellites_shared')
local group = {
Title = "GlobalStar",
Url = "http://www.celestrak.com/NORAD/elements/globalstar.txt",
TrailColor = { 0.75, 0.75, 0.35 }
}
local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
local objectNames = {}
asset.onInitialize(function ()
objectNames = shared.addSatelliteGroupObjects(group, tle, false)
end)
asset.onDeinitialize(function ()
for _, n in ipairs(objectNames) do
openspace.removeSceneGraphNode(n)
end
end)
local assetHelper = asset.require('util/asset_helper')
local shared = asset.require('../satellites_shared')
local group = {
Title = "Gorizont",
Url = "http://www.celestrak.com/NORAD/elements/gorizont.txt",
TrailColor = { 0.75, 0.75, 0.35 }
}
local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
local objectNames = {}
asset.onInitialize(function ()
objectNames = shared.addSatelliteGroupObjects(group, tle, false)
end)
asset.onDeinitialize(function ()
for _, n in ipairs(objectNames) do
openspace.removeSceneGraphNode(n)
end
end)
local assetHelper = asset.require('util/asset_helper')
local shared = asset.require('../satellites_shared')
local group = {
Title = "Intelsat",
Url = "http://www.celestrak.com/NORAD/elements/intelsat.txt",
TrailColor = { 0.75, 0.75, 0.35 }
}
local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
local objectNames = {}
asset.onInitialize(function ()
objectNames = shared.addSatelliteGroupObjects(group, tle, false)
end)
asset.onDeinitialize(function ()
for _, n in ipairs(objectNames) do
openspace.removeSceneGraphNode(n)
end
end)
local assetHelper = asset.require('util/asset_helper')
local shared = asset.require('../satellites_shared')
local group = {
Title = "Iridium",
Url = "http://www.celestrak.com/NORAD/elements/iridium.txt",
TrailColor = { 0.75, 0.75, 0.35 }
}
local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
local objectNames = {}
asset.onInitialize(function ()
objectNames = shared.addSatelliteGroupObjects(group, tle, false)
end)
asset.onDeinitialize(function ()
for _, n in ipairs(objectNames) do
openspace.removeSceneGraphNode(n)
end
end)
local assetHelper = asset.require('util/asset_helper')
local shared = asset.require('../satellites_shared')
local group = {
Title = "Iridium NEXT",
Url = "http://www.celestrak.com/NORAD/elements/iridium-NEXT.txt",
TrailColor = { 0.75, 0.75, 0.35 }
}
local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
local objectNames = {}
asset.onInitialize(function ()
objectNames = shared.addSatelliteGroupObjects(group, tle, false)
end)
asset.onDeinitialize(function ()
for _, n in ipairs(objectNames) do
openspace.removeSceneGraphNode(n)
end
end)
local assetHelper = asset.require('util/asset_helper')
local shared = asset.require('../satellites_shared')
local group = {
Title = "Molniya",
Url = "http://www.celestrak.com/NORAD/elements/molniya.txt",
TrailColor = { 0.75, 0.75, 0.35 }
}
local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
local objectNames = {}
asset.onInitialize(function ()
objectNames = shared.addSatelliteGroupObjects(group, tle, false)
end)
asset.onDeinitialize(function ()
for _, n in ipairs(objectNames) do
openspace.removeSceneGraphNode(n)
end
end)
local assetHelper = asset.require('util/asset_helper')
local shared = asset.require('../satellites_shared')
local group = {
Title = "Orbcomm",
Url = "http://www.celestrak.com/NORAD/elements/orbcomm.txt",
TrailColor = { 0.75, 0.75, 0.35 }
}
local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
local objectNames = {}
asset.onInitialize(function ()
objectNames = shared.addSatelliteGroupObjects(group, tle, false)
end)
asset.onDeinitialize(function ()
for _, n in ipairs(objectNames) do
openspace.removeSceneGraphNode(n)
end
end)
local assetHelper = asset.require('util/asset_helper')
local shared = asset.require('../satellites_shared')
local group = {
Title = "Other comm",
Url = "http://www.celestrak.com/NORAD/elements/other-comm.txt",
TrailColor = { 0.75, 0.75, 0.35 }
}
local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
local objectNames = {}
asset.onInitialize(function ()
objectNames = shared.addSatelliteGroupObjects(group, tle, false)
end)
asset.onDeinitialize(function ()
for _, n in ipairs(objectNames) do
openspace.removeSceneGraphNode(n)
end
end)
local assetHelper = asset.require('util/asset_helper')
local shared = asset.require('../satellites_shared')
local group = {
Title = "Raduga",
Url = "http://www.celestrak.com/NORAD/elements/raduga.txt",
TrailColor = { 0.75, 0.75, 0.35 }
}
local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
local objectNames = {}
asset.onInitialize(function ()
objectNames = shared.addSatelliteGroupObjects(group, tle, false)
end)
asset.onDeinitialize(function ()
for _, n in ipairs(objectNames) do
openspace.removeSceneGraphNode(n)
end
end)
local assetHelper = asset.require('util/asset_helper')
local shared = asset.require('../satellites_shared')
local group = {
Title = "SES",
Url = "http://www.celestrak.com/NORAD/elements/ses.txt",
TrailColor = { 0.75, 0.75, 0.35 }
}
local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
local objectNames = {}
asset.onInitialize(function ()
objectNames = shared.addSatelliteGroupObjects(group, tle, false)
end)
asset.onDeinitialize(function ()
for _, n in ipairs(objectNames) do
openspace.removeSceneGraphNode(n)
end
end)
local assetHelper = asset.require('util/asset_helper')
local shared = asset.require('../satellites_shared')
local group = {
Title = "Breeze-M Breakup",
Url = "http://www.celestrak.com/NORAD/elements/2012-044.txt",
TrailColor = { 0.25, 0.35, 0.45 }
}
local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
local objectNames = {}
asset.onInitialize(function ()
objectNames = shared.addSatelliteGroupObjects(group, tle, true)
end)
asset.onDeinitialize(function ()
for _, n in ipairs(objectNames) do
openspace.removeSceneGraphNode(n)
end
end)
local assetHelper = asset.require('util/asset_helper')
local shared = asset.require('../satellites_shared')
local group = {
Title = "Fengyun Debris",
Url = "http://www.celestrak.com/NORAD/elements/1999-025.txt",
TrailColor = { 0.25, 0.35, 0.45 }
}
local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
local objectNames = {}
asset.onInitialize(function ()
objectNames = shared.addSatelliteGroupObjects(group, tle, true)
end)
asset.onDeinitialize(function ()
for _, n in ipairs(objectNames) do
openspace.removeSceneGraphNode(n)
end
end)
local assetHelper = asset.require('util/asset_helper')
local shared = asset.require('../satellites_shared')
local group = {
Title = "Iridium 33 Debris",
Url = "http://www.celestrak.com/NORAD/elements/iridium-33-debris.txt",
TrailColor = { 0.25, 0.35, 0.45 }
}
local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
local objectNames = {}
asset.onInitialize(function ()
objectNames = shared.addSatelliteGroupObjects(group, tle, true)
end)
asset.onDeinitialize(function ()
for _, n in ipairs(objectNames) do
openspace.removeSceneGraphNode(n)
end
end)
local assetHelper = asset.require('util/asset_helper')
local shared = asset.require('../satellites_shared')
local group = {
Title = "Kosmos 2251 Debris",
Url = "http://www.celestrak.com/NORAD/elements/cosmos-2251-debris.txt",
TrailColor = { 0.25, 0.35, 0.45 }
}
local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
local objectNames = {}
asset.onInitialize(function ()
objectNames = shared.addSatelliteGroupObjects(group, tle, true)
end)
asset.onDeinitialize(function ()
for _, n in ipairs(objectNames) do
openspace.removeSceneGraphNode(n)
end
end)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment