Rename layers to remove verb

This commit is contained in:
Alexander Bock
2020-07-31 15:36:34 +02:00
parent fb58aac2d4
commit e5dae26989
33 changed files with 14 additions and 427 deletions

View File

@@ -11,21 +11,20 @@ asset.require('spice/base')
asset.require('scene/solarsystem/sun/sun')
asset.require('scene/solarsystem/sun/glare')
asset.require('scene/solarsystem/planets')
asset.require('scene/solarsystem/sun/default_layers')
asset.require('scene/solarsystem/planets/planets')
asset.require('scene/solarsystem/planets/default_layers')
asset.require('scene/solarsystem/planets/mars/moons/phobos')
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')
assetHelper.requestAll(asset, 'scene/digitaluniverse')
-- Set enabled layers for globes
asset.require('scene/solarsystem/planets/add_all_planets_default_layers')
asset.require('scene/solarsystem/sun/add_sun_default_layers')
asset.require('scene/solarsystem/dwarf_planets/add_all_dwarf_planets_default_layers')
-- Load default key bindings applicable to most scenes
asset.require('util/default_keybindings')
asset.require('util/default_dashboard')

View File

@@ -1,2 +0,0 @@
asset.require('./pluto/add_pluto_default_layers')
asset.require('./pluto/charon/add_charon_default_layers')

View File

@@ -1,13 +0,0 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./pluto')
local globeIdentifier = globeAsset.Pluto.Identifier
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorLayer = asset.require('./layers/colorlayers/greyscale_usgs').layer
colorLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
end)

View File

@@ -1,13 +0,0 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./charon')
local globeIdentifier = globeAsset.Charon.Identifier
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorLayer = asset.require('./layers/colorlayers/greyscale_usgs').layer
colorLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
end)

View File

@@ -1,5 +1,5 @@
local assetHelper = asset.require('util/asset_helper')
local transforms = asset.require('./../transforms')
local transforms = asset.require('../transforms')
asset.require("spice/base")

View File

@@ -1,6 +1,6 @@
local assetHelper = asset.require('util/asset_helper')
local transforms = asset.require('./../transforms')
local kernels = asset.require('./../kernels').PlutoKernels
local transforms = asset.require('../transforms')
local kernels = asset.require('../kernels').PlutoKernels

View File

@@ -1,6 +1,6 @@
local assetHelper = asset.require('util/asset_helper')
local transforms = asset.require('./../transforms')
local kernels = asset.require('./../kernels').PlutoKernels
local transforms = asset.require('../transforms')
local kernels = asset.require('../kernels').PlutoKernels

View File

@@ -1,6 +1,6 @@
local assetHelper = asset.require('util/asset_helper')
local transforms = asset.require('./../transforms')
local kernels = asset.require('./../kernels').PlutoKernels
local transforms = asset.require('../transforms')
local kernels = asset.require('../kernels').PlutoKernels

View File

@@ -1,6 +1,6 @@
local assetHelper = asset.require('util/asset_helper')
local transforms = asset.require('./../transforms')
local kernels = asset.require('./../kernels').PlutoKernels
local transforms = asset.require('../transforms')
local kernels = asset.require('../kernels').PlutoKernels

View File

@@ -1,34 +0,0 @@
asset.request('./planets/mercury/mercury')
asset.request('./planets/venus/venus')
asset.request('./planets/venus/atmosphere')
asset.request('./planets/earth/earth')
asset.request('./planets/earth/atmosphere')
asset.request('./planets/earth/markers')
asset.request('./planets/earth/moon/moon')
asset.request('./planets/mars/mars')
asset.request('./planets/mars/atmosphere')
asset.request('./planets/jupiter/jupiter')
asset.request('./planets/jupiter/major_moons')
asset.request('./planets/saturn/saturn')
asset.request('./planets/saturn/major_moons')
asset.request('./planets/uranus/uranus')
asset.request('./planets/uranus/major_moons')
asset.request('./planets/neptune/neptune')
asset.request('./planets/neptune/major_moons')
asset.meta = {
Name = "Planets",
Version = "1.0",
Description = [[ Collection of planets in the solar system ]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license"
}

View File

@@ -1,28 +0,0 @@
asset.require('./earth/add_earth_default_layers')
asset.require('./earth/moon/add_moon_default_layers')
asset.require('./jupiter/add_jupiter_default_layers')
asset.require('./jupiter/callisto/add_default_layers')
asset.require('./jupiter/europa/add_default_layers')
asset.require('./jupiter/ganymede/add_default_layers')
asset.require('./jupiter/io/add_default_layers')
asset.require('./mars/add_mars_default_layers')
asset.require('./mercury/add_mercury_default_layers')
asset.require('./neptune/add_neptune_default_layers')
asset.require('./saturn/add_saturn_default_layers')
asset.require('./saturn/dione/add_default_layers')
asset.require('./saturn/enceladus/add_default_layers')
asset.require('./saturn/hyperion/add_default_layers')
asset.require('./saturn/iapetus/add_default_layers')
asset.require('./saturn/mimas/add_default_layers')
asset.require('./saturn/rhea/add_default_layers')
asset.require('./saturn/tethys/add_default_layers')
asset.require('./saturn/titan/add_default_layers')
asset.require('./uranus/add_uranus_default_layers')
asset.require('./venus/add_venus_default_layers')

View File

@@ -1,33 +0,0 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./earth')
local globeIdentifier = globeAsset.Earth.Identifier
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorFallbackLayer = asset.require('./layers/colorlayers/blue_marble_fallback').layer
local nightFallbackLayer = asset.require('./layers/nightlayers/earth_night_texture').layer
local heightFallbackLayer = asset.require('./layers/heightlayers/blue_marble_height_fallback').layer
colorFallbackLayer.Enabled = true
heightFallbackLayer.Enabled = true
nightFallbackLayer.Enabled = true
local colorLayer = asset.require('./layers/colorlayers/esri_viirs_combo').layer
local heightLayer = asset.require('./layers/heightlayers/terrain_tileset').layer
local nightLayer = asset.require('./layers/nightlayers/earth_at_night_2012').layer
local waterMask = asset.require('./layers/watermasks/modis_water_mask').layer
colorLayer.Enabled = true
colorLayer.Fallback = colorFallbackLayer
heightLayer.Enabled = true
heightLayer.Fallback = heightFallbackLayer
nightLayer.Enabled = true
nightLayer.Fallback = nightFallbackLayer
waterMask.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
end)

View File

@@ -1,16 +0,0 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./moon')
local globeIdentifier = globeAsset.Moon.Identifier
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorLayer = asset.require('./layers/colorlayers/wac_utah').layer
local heightLayer = asset.require('./layers/heightlayers/loladem_utah').layer
colorLayer.Enabled = true
heightLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
end)

View File

@@ -1,13 +0,0 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./jupiter')
local globeIdentifier = globeAsset.Jupiter.Identifier
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorLayer = asset.require('./layers/colorlayers/jupiter_texture').layer
colorLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
end)

View File

@@ -1,13 +0,0 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./callisto')
local globeIdentifier = globeAsset.Callisto.Identifier
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorLayer = asset.require('./layers/colorlayers/callisto_texture').layer
colorLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
end)

View File

@@ -1,13 +0,0 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./europa')
local globeIdentifier = globeAsset.Europa.Identifier
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorLayer = asset.require('./layers/colorlayers/voyager_global_mosaic').layer
colorLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
end)

View File

@@ -1,13 +0,0 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./ganymede')
local globeIdentifier = globeAsset.Ganymede.Identifier
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorLayer = asset.require('./layers/colorlayers/ganymede_texture').layer
colorLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
end)

View File

@@ -1,13 +0,0 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./io')
local globeIdentifier = globeAsset.Io.Identifier
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorLayer = asset.require('./layers/colorlayers/io_texture').layer
colorLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
end)

View File

@@ -1,21 +0,0 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./mars')
local globeIdentifier = globeAsset.Mars.Identifier
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorFallbackLayer = asset.require('./layers/colorlayers/mars_texture').layer
colorFallbackLayer.Enabled = true
local colorLayer = asset.require('./layers/colorlayers/moc_wa_color_utah').layer
local heightLayer = asset.require('./layers/heightlayers/mola_utah').layer
colorLayer.Enabled = true
colorLayer.Fallback = colorFallbackLayer
heightLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
end)

View File

@@ -1,13 +0,0 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./mercury')
local globeIdentifier = globeAsset.Mercury.Identifier
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorLayer = asset.require('./layers/colorlayers/messenger_bdr_utah').layer
colorLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
end)

View File

@@ -1,13 +0,0 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./neptune')
local globeIdentifier = globeAsset.Neptune.Identifier
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorLayer = asset.require('./layers/colorlayers/neptune_texture').layer
colorLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
end)

View File

@@ -1,13 +0,0 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./saturn')
local globeIdentifier = globeAsset.Saturn.Identifier
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorLayer = asset.require('./layers/colorlayers/saturn_texture').layer
colorLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
end)

View File

@@ -1,13 +0,0 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./dione')
local globeIdentifier = globeAsset.Dione.Identifier
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorLayer = asset.require('./layers/colorlayers/dione_texture').layer
colorLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
end)

View File

@@ -1,13 +0,0 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./enceladus')
local globeIdentifier = globeAsset.Enceladus.Identifier
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorLayer = asset.require('./layers/colorlayers/global_mosaic_100m_hpf').layer
colorLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
end)

View File

@@ -1,12 +0,0 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./hyperion')
local globeIdentifier = globeAsset.Hyperion.Identifier
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
-- @TODO: when we have a working texture, set it to enabled here
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
end)

View File

@@ -1,13 +0,0 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./iapetus')
local globeIdentifier = globeAsset.Iapetus.Identifier
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorLayer = asset.require('./layers/colorlayers/iapetus_texture').layer
colorLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
end)

View File

@@ -1,13 +0,0 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./mimas')
local globeIdentifier = globeAsset.Mimas.Identifier
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorLayer = asset.require('./layers/colorlayers/mimas_texture').layer
colorLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
end)

View File

@@ -1,13 +0,0 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./rhea')
local globeIdentifier = globeAsset.Rhea.Identifier
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorLayer = asset.require('./layers/colorlayers/rhea_texture').layer
colorLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
end)

View File

@@ -1,13 +0,0 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./tethys')
local globeIdentifier = globeAsset.Tethys.Identifier
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorLayer = asset.require('./layers/colorlayers/tethys_texture').layer
colorLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
end)

View File

@@ -1,16 +0,0 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./titan')
local globeIdentifier = globeAsset.Titan.Identifier
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorLayer = asset.require(
'./layers/colorlayers/cassini_iss_global_mosaic_4km_liu'
).layer
colorLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
end)

View File

@@ -1,13 +0,0 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./uranus')
local globeIdentifier = globeAsset.Uranus.Identifier
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorLayer = asset.require('./layers/colorlayers/uranus_texture').layer
colorLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
end)

View File

@@ -1,16 +0,0 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./venus')
local globeIdentifier = globeAsset.Venus.Identifier
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorLayer = asset.require('./layers/colorlayers/magellan_mosaic_utah').layer
local heightLayer = asset.require('./layers/heightlayers/magellan').layer
colorLayer.Enabled = true
heightLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
end)

View File

@@ -1,13 +0,0 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./sun')
local globeIdentifier = globeAsset.Sun.Identifier
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorLayer = asset.require('./layers/colorlayers/sun_texture').layer
colorLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
end)