Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
OpenSpace
Commits
3e107fa3
Commit
3e107fa3
authored
7 years ago
by
Alexander Bock
Browse files
Options
Download
Email Patches
Plain Diff
Add Pluto system to the default scene
parent
190952e4
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/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/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
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
data/assets/default.scene
+1
-0
data/assets/default.scene
data/assets/scene/solarsystem/dwarf_planets/pluto/charon.asset
+67
-0
...assets/scene/solarsystem/dwarf_planets/pluto/charon.asset
data/assets/scene/solarsystem/dwarf_planets/pluto/charon_trail.asset
+28
-0
.../scene/solarsystem/dwarf_planets/pluto/charon_trail.asset
data/assets/scene/solarsystem/dwarf_planets/pluto/hydra.asset
+51
-0
.../assets/scene/solarsystem/dwarf_planets/pluto/hydra.asset
data/assets/scene/solarsystem/dwarf_planets/pluto/kerberos.asset
+51
-0
...sets/scene/solarsystem/dwarf_planets/pluto/kerberos.asset
data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset
+13
-0
...ssets/scene/solarsystem/dwarf_planets/pluto/kernels.asset
data/assets/scene/solarsystem/dwarf_planets/pluto/nix.asset
+51
-0
data/assets/scene/solarsystem/dwarf_planets/pluto/nix.asset
data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
+78
-0
.../assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset
+28
-0
...s/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset
data/assets/scene/solarsystem/dwarf_planets/pluto/styx.asset
+51
-0
data/assets/scene/solarsystem/dwarf_planets/pluto/styx.asset
data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset
+10
-0
...assets/scene/solarsystem/dwarf_planets/pluto/system.asset
data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset
+32
-0
.../assets/scene/solarsystem/dwarf_planets/pluto/trail.asset
data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset
+27
-0
...ts/scene/solarsystem/dwarf_planets/pluto/transforms.asset
with
488 additions
and
0 deletions
+488
-0
data/assets/default.scene
+
1
-
0
View file @
3e107fa3
...
...
@@ -8,6 +8,7 @@ assetHelper.requestAll(asset, 'scene/solarsystem/sun')
asset.require('scene/solarsystem/planets')
asset.require('scene/solarsystem/planets/mars/moons/phobos')
asset.require('scene/solarsystem/planets/mars/moons/deimos')
asset.require('scene/solarsystem/dwarf_planets/pluto/system')
assetHelper.requestAll(asset, 'scene/digitaluniverse')
-- Load default key bindings applicable to most scenes
asset.require('util/default_keybindings')
...
...
This diff is collapsed.
Click to expand it.
data/assets/scene/solarsystem/dwarf_planets/pluto/charon.asset
0 → 100644
+
67
-
0
View file @
3e107fa3
local assetHelper = asset.require('util/asset_helper')
local transforms = asset.require('./transforms')
asset.require("spice/base")
asset.request('./trail')
local textures = asset.syncedResource({
Name = "Charon Textures",
Type = "HttpSynchronization",
Identifier = "charon_textures",
Version = 3
})
local Charon = {
Identifier = "Charon",
Parent = transforms.PlutoBarycenter.Identifier,
Transform = {
Translation = {
Type = "SpiceTranslation",
Target = "CHARON",
Observer = "PLUTO BARYCENTER",
Kernels = NewHorizonsKernels
},
Rotation = {
Type = "SpiceRotation",
SourceFrame = "IAU_CHARON",
DestinationFrame = "GALACTIC"
},
Scale = {
Type = "StaticScale",
Scale = 1.0
}
},
Renderable = {
Type = "RenderableGlobe",
Radii = { 6.035E5, 6.035E5, 6.035E5 },
SegmentsPerPatch = 64,
Layers = {
ColorLayers = {
{
Identifier = "Greyscale",
Name = "Black & White",
FilePath = textures .. "/NH_Charon_mosaic.png",
}
},
HeightLayers = {
{
Identifier = "DTM",
Name = "DTM",
FilePath = textures .. "/NH_Charon_DTM.png",
Enabled = true,
Settings = { Multiplier = 20.0 },
TilePixelSize = 64
}
}
}
},
Tag = { "planet_solarSystem", "planet_terrestrial" },
GUI = {
Path = "/Solar System/Dwarf Planets/Pluto"
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { Charon })
This diff is collapsed.
Click to expand it.
data/assets/scene/solarsystem/dwarf_planets/pluto/charon_trail.asset
0 → 100644
+
28
-
0
View file @
3e107fa3
local assetHelper = asset.require('util/asset_helper')
local transforms = asset.require('./transforms')
asset.require("spice/base")
local CharonTrailBarycentric = {
Identifier = "CharonBarycentricTrail",
Parent = transforms.PlutoBarycenter.Identifier,
Renderable = {
Type = "RenderableTrailOrbit",
Translation = {
Type = "SpiceTranslation",
Target = "CHARON",
Observer = "PLUTO BARYCENTER"
},
Color = { 0.00, 0.62, 1.00 },
Period = 6.38723,
Resolution = 1000
},
GUI = {
Name = "Pluto Barycenteric Trail",
Path = "/Solar System/Dwarf Planets/Pluto"
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { CharonTrailBarycentric })
This diff is collapsed.
Click to expand it.
data/assets/scene/solarsystem/dwarf_planets/pluto/hydra.asset
0 → 100644
+
51
-
0
View file @
3e107fa3
local assetHelper = asset.require('util/asset_helper')
local transforms = asset.require('./transforms')
local kernels = asset.require('./kernels').PlutoKernels
local Hydra = {
Identifier = "Hydra",
Parent = transforms.PlutoBarycenter.Identifier,
Transform = {
Translation = {
Type = "SpiceTranslation",
Target = "HYDRA",
Observer = "PLUTO BARYCENTER",
Kernels = kernels
}
},
Renderable = {
Type = "RenderableGlobe",
Radii = { 0.53E5, 0.53E5, 0.53E5 },
SegmentsPerPatch = 64,
Layers = {}
},
GUI = {
Path = "/Solar System/Dwarf Planets/Pluto"
}
}
local HydraTrail = {
Identifier = "HydraTrail",
Parent = transforms.PlutoBarycenter.Identifier,
Renderable = {
Type = "RenderableTrailOrbit",
Translation = {
Type = "SpiceTranslation",
Target = "HYDRA",
Observer = "PLUTO BARYCENTER",
},
Color = { 0.00, 0.62, 1.00 },
Period = 38.20177,
Resolution = 1000
},
GUI = {
Name = "Hydra Trail",
Path = "/Solar System/Dwarf Planets/Pluto"
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { Hydra, HydraTrail })
This diff is collapsed.
Click to expand it.
data/assets/scene/solarsystem/dwarf_planets/pluto/kerberos.asset
0 → 100644
+
51
-
0
View file @
3e107fa3
local assetHelper = asset.require('util/asset_helper')
local transforms = asset.require('./transforms')
local kernels = asset.require('./kernels').PlutoKernels
local Kerberos = {
Identifier = "Kerberos",
Parent = transforms.PlutoBarycenter.Identifier,
Transform = {
Translation = {
Type = "SpiceTranslation",
Target = "KERBEROS",
Observer = "PLUTO BARYCENTER",
Kernels = PlutoKernels
}
},
Renderable = {
Type = "RenderableGlobe",
Radii = { 0.1E5, 0.1E5, 0.1E5 },
SegmentsPerPatch = 64,
Layers = {}
},
GUI = {
Path = "/Solar System/Dwarf Planets/Pluto"
}
}
local KerberosTrail = {
Identifier = "KerberosTrail",
Parent = transforms.PlutoBarycenter.Identifier,
Renderable = {
Type = "RenderableTrailOrbit",
Translation = {
Type = "SpiceTranslation",
Target = "KERBEROS",
Observer = "PLUTO BARYCENTER",
},
Color = { 0.00, 0.62, 1.00 },
Period = 32.16756,
Resolution = 1000
},
GUI = {
Name = "Hydra Trail",
Path = "/Solar System/Dwarf Planets/Pluto"
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { Kerberos, KerberosTrail })
This diff is collapsed.
Click to expand it.
data/assets/scene/solarsystem/dwarf_planets/pluto/kernels.asset
0 → 100644
+
13
-
0
View file @
3e107fa3
local Kernels = asset.syncedResource({
Name = "Pluto Kernels",
Type = "HttpSynchronization",
Identifier = "pluto_kernels",
Version = 1
})
local PlutoKernels = {
Kernels .. "/NavPE_de433_od122.bsp",
Kernels .. "/NavSE_plu047_od122.bsp"
}
asset.export("PlutoKernels", PlutoKernels)
This diff is collapsed.
Click to expand it.
data/assets/scene/solarsystem/dwarf_planets/pluto/nix.asset
0 → 100644
+
51
-
0
View file @
3e107fa3
local assetHelper = asset.require('util/asset_helper')
local transforms = asset.require('./transforms')
local kernels = asset.require('./kernels').PlutoKernels
local Nix = {
Identifier = "Nix",
Parent = transforms.PlutoBarycenter.Identifier,
Transform = {
Translation = {
Type = "SpiceTranslation",
Target = "NIX",
Observer = "PLUTO BARYCENTER",
Kernels = PlutoKernels
}
},
Renderable = {
Type = "RenderableGlobe",
Radii = { 0.45E5, 0.45E5, 0.45E5 },
SegmentsPerPatch = 64,
Layers = {}
},
GUI = {
Path = "/Solar System/Dwarf Planets/Pluto"
}
}
local NixTrail = {
Identifier = "NixTrail",
Parent = transforms.PlutoBarycenter.Identifier,
Renderable = {
Type = "RenderableTrailOrbit",
Translation = {
Type = "SpiceTranslation",
Target = "NIX",
Observer = "PLUTO BARYCENTER",
},
Color = { 0.00, 0.62, 1.00 },
Period = 24.85463,
Resolution = 1000
},
GUI = {
Name = "Hydra Trail",
Path = "/Solar System/Dwarf Planets/Pluto"
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { Nix, NixTrail })
This diff is collapsed.
Click to expand it.
data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
0 → 100644
+
78
-
0
View file @
3e107fa3
local assetHelper = asset.require('util/asset_helper')
local transforms = asset.require('./transforms')
asset.require("spice/base")
asset.request('./trail')
local textures = asset.syncedResource({
Name = "Pluto Textures",
Type = "HttpSynchronization",
Identifier = "pluto_textures",
Version = 5
})
local Pluto = {
Identifier = "Pluto",
Parent = transforms.PlutoBarycenter.Identifier,
Transform = {
Translation = {
Type = "SpiceTranslation",
Target = "PLUTO",
Observer = "PLUTO BARYCENTER",
Kernels = NewHorizonsKernels
},
Rotation = {
Type = "SpiceRotation",
SourceFrame = "IAU_PLUTO",
DestinationFrame = "GALACTIC"
},
Scale = {
Type = "StaticScale",
Scale = 1.0
}
},
Renderable = {
Type = "RenderableGlobe",
Radii = { 1.173E6, 1.173E6, 1.173E6 },
SegmentsPerPatch = 64,
Layers = {
ColorLayers = {
{
Identifier = "Greyscale",
Name = "Black & White",
FilePath = textures .. "/NH_Pluto_mosaic_16384.png",
Enabled = true
},
{
Identifier = "Color",
Name = "Color",
FilePath = textures .. "/pmap_cyl_k201.jpg"
},
{
Identifier = "Hubble",
Name = "Hubble",
FilePath = textures .. "/pluto.png"
}
},
HeightLayers = {
{
Identifier = "DTM",
Name = "DTM",
FilePath = textures .. "/NH_Pluto_DTM_16384.png",
Enabled = true,
Settings = { Multiplier = 20.0 },
TilePixelSize = 64
}
}
}
},
Tag = { "planet_solarSystem", "planet_terrestrial" },
GUI = {
Path = "/Solar System/Dwarf Planets/Pluto"
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { Pluto })
This diff is collapsed.
Click to expand it.
data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset
0 → 100644
+
28
-
0
View file @
3e107fa3
local assetHelper = asset.require('util/asset_helper')
local transforms = asset.require('./transforms')
asset.require("spice/base")
local PlutoTrailBarycentric = {
Identifier = "PlutoBarycentricTrail",
Parent = transforms.PlutoBarycenter.Identifier,
Renderable = {
Type = "RenderableTrailOrbit",
Translation = {
Type = "SpiceTranslation",
Target = "PLUTO",
Observer = "PLUTO BARYCENTER"
},
Color = { 0.00, 0.62, 1.00 },
Period = 6.38723,
Resolution = 1000
},
GUI = {
Name = "Pluto Barycenteric Trail",
Path = "/Solar System/Dwarf Planets/Pluto"
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { PlutoTrailBarycentric })
This diff is collapsed.
Click to expand it.
data/assets/scene/solarsystem/dwarf_planets/pluto/styx.asset
0 → 100644
+
51
-
0
View file @
3e107fa3
local assetHelper = asset.require('util/asset_helper')
local transforms = asset.require('./transforms')
local kernels = asset.require('./kernels').PlutoKernels
local Styx = {
Identifier = "Styx",
Parent = transforms.PlutoBarycenter.Identifier,
Transform = {
Translation = {
Type = "SpiceTranslation",
Target = "STYX",
Observer = "PLUTO BARYCENTER",
Kernels = PlutoKernels
}
},
Renderable = {
Type = "RenderableGlobe",
Radii = { 0.45E5, 0.45E5, 0.45E5 },
SegmentsPerPatch = 64,
Layers = {}
},
GUI = {
Path = "/Solar System/Dwarf Planets/Pluto"
}
}
local StyxTrail = {
Identifier = "StyxTrail",
Parent = transforms.PlutoBarycenter.Identifier,
Renderable = {
Type = "RenderableTrailOrbit",
Translation = {
Type = "SpiceTranslation",
Target = "STYX",
Observer = "PLUTO BARYCENTER",
},
Color = { 0.00, 0.62, 1.00 },
Period = 20.16155,
Resolution = 1000
},
GUI = {
Name = "Hydra Trail",
Path = "/Solar System/Dwarf Planets/Pluto"
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { Styx, StyxTrail })
This diff is collapsed.
Click to expand it.
data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset
0 → 100644
+
10
-
0
View file @
3e107fa3
asset.request('./trail')
asset.request('./pluto')
asset.request('./pluto_trail')
asset.request('./charon')
asset.request('./charon_trail')
asset.request('./hydra')
asset.request('./kerberos')
asset.request('./nix')
asset.request('./styx')
This diff is collapsed.
Click to expand it.
data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset
0 → 100644
+
32
-
0
View file @
3e107fa3
local assetHelper = asset.require('util/asset_helper')
local transforms = asset.require('scene/solarsystem/sun/transforms')
asset.require("spice/base")
local kernels = asset.require('./kernels').PlutoKernels
local PlutoBarycenterTrail = {
Identifier = "PlutoBarycenterTrail",
Parent = transforms.SolarSystemBarycenter.Identifier,
Renderable = {
Type = "RenderableTrailOrbit",
Translation = {
Type = "SpiceTranslation",
Target = "PLUTO BARYCENTER",
Observer = "SUN",
Kernels = kernels
},
Color = { 0.3, 0.7, 0.3 },
Period = 365.25,
Resolution = 1000
},
Tag = { "planetTrail_solarSystem", "planetTrail_dwarf" },
GUI = {
Name = "Pluto Barycenter Trail",
Path = "/Solar System/Dwarf Planets/Pluto"
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { PlutoBarycenterTrail })
This diff is collapsed.
Click to expand it.
data/assets/scene/solarsystem/dwarf_planets/pluto/transforms.asset
0 → 100644
+
27
-
0
View file @
3e107fa3
local assetHelper = asset.require('util/asset_helper')
local transforms = asset.require('scene/solarsystem/sun/transforms')
local kernels = asset.require('./kernels').PlutoKernels
asset.require("spice/base")
local PlutoBarycenter = {
Identifier = "PlutoBarycenter",
Parent = transforms.SolarSystemBarycenter.Identifier,
Transform = {
Translation = {
Type = "SpiceTranslation",
Target = "PLUTO BARYCENTER",
Observer = "SUN",
Kernels = kernels
}
},
GUI = {
Name = "Pluto Barycenter",
Path = "/Solar System/Dwarf Planets/Pluto"
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { PlutoBarycenter })
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help