mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-04 02:29:49 -06:00
Various updates and fixes to scene and assets
This commit is contained in:
@@ -7,12 +7,6 @@ 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/planets/jupiter/minor_moons')
|
||||
-- asset.require('scene/solarsystem/planets/saturn/minor_moons')
|
||||
-- asset.require('scene/solarsystem/planets/uranus/minor_moons')
|
||||
-- asset.require('scene/solarsystem/planets/neptune/inner_moons')
|
||||
-- asset.require('scene/solarsystem/planets/neptune/irregular_prograde_moons')
|
||||
-- asset.require('scene/solarsystem/planets/neptune/irregular_retrograde_moons')
|
||||
assetHelper.requestAll(asset, 'scene/digitaluniverse')
|
||||
|
||||
-- Load default key bindings applicable to most scenes
|
||||
|
||||
7
data/assets/default_full.scene
Normal file
7
data/assets/default_full.scene
Normal file
@@ -0,0 +1,7 @@
|
||||
asset.require('./default')
|
||||
asset.require('scene/solarsystem/planets/jupiter/minor_moons')
|
||||
asset.require('scene/solarsystem/planets/saturn/minor_moons')
|
||||
asset.require('scene/solarsystem/planets/uranus/minor_moons')
|
||||
asset.require('scene/solarsystem/planets/neptune/inner_moons')
|
||||
asset.require('scene/solarsystem/planets/neptune/irregular_prograde_moons')
|
||||
asset.require('scene/solarsystem/planets/neptune/irregular_retrograde_moons')
|
||||
10
data/assets/everything.asset
Normal file
10
data/assets/everything.asset
Normal file
@@ -0,0 +1,10 @@
|
||||
-- Please note that this scene/asset is not meant to be included anywhere directly.
|
||||
-- Rather it is used in the Sync application to synchronize the entire asset folder
|
||||
-- without needing manual adaption
|
||||
|
||||
local assetHelper = asset.require('util/asset_helper')
|
||||
local sceneHelper = asset.require('util/scene_helper')
|
||||
|
||||
assetHelper.requestAll(asset, 'scene')
|
||||
assetHelper.requestAll(asset, 'spice')
|
||||
assetHelper.requestAll(asset, 'util')
|
||||
@@ -136,7 +136,7 @@ asset.onInitialize(function ()
|
||||
openspace.set_default_dashboard()
|
||||
openspace.dashboard.addDashboardItem({
|
||||
Type = "DashboardItemSpacing",
|
||||
Spacing = 50
|
||||
Spacing = 25
|
||||
})
|
||||
|
||||
openspace.dashboard.addDashboardItem({
|
||||
|
||||
@@ -84,6 +84,23 @@ asset.onInitialize(function ()
|
||||
sceneHelper.bindKeys(Keybindings)
|
||||
|
||||
openspace.set_default_dashboard()
|
||||
openspace.dashboard.addDashboardItem({
|
||||
Type = "DashboardItemSpacing",
|
||||
Spacing = 25
|
||||
})
|
||||
|
||||
openspace.dashboard.addDashboardItem({
|
||||
Type = "DashboardItemDistance",
|
||||
SourceType = "Node",
|
||||
SourceNodeName = "OsirisRex",
|
||||
DestinationType = "Node",
|
||||
DestinationNodeName = "BennuBarycenter"
|
||||
})
|
||||
|
||||
openspace.dashboard.addDashboardItem({
|
||||
Type = "DashboardItemInstruments"
|
||||
})
|
||||
|
||||
openspace.set_default_gui_sorting()
|
||||
|
||||
sceneHelper.setDeltaTimeKeys({
|
||||
|
||||
@@ -85,6 +85,23 @@ asset.onInitialize(function ()
|
||||
sceneHelper.bindKeys(Keybindings)
|
||||
|
||||
openspace.set_default_dashboard()
|
||||
openspace.dashboard.addDashboardItem({
|
||||
Type = "DashboardItemSpacing",
|
||||
Spacing = 25
|
||||
})
|
||||
|
||||
openspace.dashboard.addDashboardItem({
|
||||
Type = "DashboardItemDistance",
|
||||
SourceType = "Node",
|
||||
SourceNodeName = "Rosetta",
|
||||
DestinationType = "Node",
|
||||
DestinationNodeName = "67P"
|
||||
})
|
||||
|
||||
openspace.dashboard.addDashboardItem({
|
||||
Type = "DashboardItemInstruments"
|
||||
})
|
||||
|
||||
openspace.set_default_gui_sorting()
|
||||
|
||||
sceneHelper.setDeltaTimeKeys({
|
||||
@@ -93,7 +110,7 @@ asset.onInitialize(function ()
|
||||
})
|
||||
|
||||
openspace.mark_interesting_nodes({
|
||||
"67PBarycenter", "Rosetta", "Philae"
|
||||
"67P", "Rosetta", "Philae"
|
||||
})
|
||||
|
||||
openspace.addVirtualProperty(
|
||||
|
||||
@@ -250,6 +250,7 @@ local PlutoTrail = {
|
||||
Parent = sunTransforms.SolarSystemBarycenter.Name,
|
||||
Renderable = {
|
||||
Type = "RenderableTrailOrbit",
|
||||
Enabled = false,
|
||||
Translation = {
|
||||
Type = "SpiceTranslation",
|
||||
Target = "PLUTO BARYCENTER",
|
||||
|
||||
@@ -24,8 +24,8 @@ local BENNU_BODY = "2101955"
|
||||
local Bennu = {
|
||||
Name = "Bennu",
|
||||
Parent = transforms.BennuBarycenter.Name,
|
||||
Transform = {
|
||||
Rotation = {
|
||||
Transform =
|
||||
{ Rotation = {
|
||||
Type = "SpiceRotation",
|
||||
SourceFrame = "IAU_BENNU",
|
||||
DestinationFrame = "GALACTIC"
|
||||
@@ -40,8 +40,8 @@ local Bennu = {
|
||||
},
|
||||
ColorTexture = textures .. "/gray.png",
|
||||
Projection = {
|
||||
Sequence = "InstrumentTimes",
|
||||
SequenceType = asset.localResource('instrumentTimes'),
|
||||
Sequence = asset.localResource('InstrumentTimes'),
|
||||
SequenceType = "instrument-times",
|
||||
Observer = "OSIRIS-REX",
|
||||
Target = BENNU_BODY,
|
||||
Aberration = "NONE",
|
||||
@@ -107,4 +107,4 @@ local BennuTrail = {
|
||||
}
|
||||
|
||||
|
||||
-- assetHelper.registerSceneGraphNodesAndExport(asset, { Bennu, BennuTrail })
|
||||
assetHelper.registerSceneGraphNodesAndExport(asset, { Bennu, BennuTrail })
|
||||
|
||||
@@ -55,7 +55,7 @@ local OsirisRexTrailBennu = {
|
||||
Observer = BENNU_BODY
|
||||
},
|
||||
Color = { 0.9, 0.2, 0.9 },
|
||||
StartTime = "2016 SEP 8 23:05:00.50",
|
||||
StartTime = "2018 SEP 4 00:00:00",
|
||||
EndTime = "2023 SEP 24 12:00:00",
|
||||
SampleInterval = 3600
|
||||
},
|
||||
|
||||
@@ -32,7 +32,7 @@ local imagesTorrent = asset.syncedResource({
|
||||
}) .. "/rosettaimages"
|
||||
|
||||
local Barycenter = {
|
||||
Name = "Barycenter",
|
||||
Name = "67PBarycenter",
|
||||
Parent = transforms.SolarSystemBarycenter.Name,
|
||||
Transform = {
|
||||
Translation = {
|
||||
|
||||
@@ -8,14 +8,14 @@ local textures = asset.syncedResource({
|
||||
Name = "Rosetta Textures",
|
||||
Type = "HttpSynchronization",
|
||||
Identifier = "rosetta_textures",
|
||||
Version = 1
|
||||
Version = 2
|
||||
})
|
||||
|
||||
local models = asset.syncedResource({
|
||||
Name = "Rosetta Models",
|
||||
Type = "HttpSynchronization",
|
||||
Identifier = "rosetta_model",
|
||||
Version = 1
|
||||
Version = 3
|
||||
})
|
||||
|
||||
local kernels = asset.syncedResource({
|
||||
@@ -325,7 +325,7 @@ local PhilaeParts = {
|
||||
Type = "MultiModelGeometry",
|
||||
GeometryFile = models .. "/lander_parts.obj"
|
||||
},
|
||||
ColorTexture = models .. "/foil_silver_ramp.png",
|
||||
ColorTexture = textures .. "/foil_silver_ramp.png",
|
||||
ModelTransform = RotationMatrix
|
||||
},
|
||||
GuiPath = "/Solar System/Missions/Rosetta"
|
||||
@@ -427,7 +427,7 @@ local PhilaeTrail = {
|
||||
|
||||
assetHelper.registerSceneGraphNodesAndExport(asset, {
|
||||
Rosetta,
|
||||
RosettsModel,
|
||||
RosettaModel,
|
||||
RosettaBlackFoil,
|
||||
RosettaBlackParts,
|
||||
RosettaDish,
|
||||
@@ -449,5 +449,5 @@ assetHelper.registerSceneGraphNodesAndExport(asset, {
|
||||
PhilaeSolarPanels,
|
||||
|
||||
RosettaCometTrail,
|
||||
PhilaeTrail,
|
||||
PhilaeTrail
|
||||
})
|
||||
|
||||
@@ -1,30 +1,34 @@
|
||||
return {
|
||||
{
|
||||
Type = "SyncAssetTask",
|
||||
Asset = "dawn"
|
||||
},
|
||||
{
|
||||
Type = "SyncAssetTask",
|
||||
Asset = "default"
|
||||
},
|
||||
{
|
||||
Type = "SyncAssetTask",
|
||||
Asset = "juno"
|
||||
},
|
||||
{
|
||||
Type = "SyncAssetTask",
|
||||
Asset = "newhorizons"
|
||||
},
|
||||
{
|
||||
Type = "SyncAssetTask",
|
||||
Asset = "osirisrex"
|
||||
},
|
||||
{
|
||||
Type = "SyncAssetTask",
|
||||
Asset = "rosetta"
|
||||
},
|
||||
{
|
||||
Type = "SyncAssetTask",
|
||||
Asset = "dawn"
|
||||
},
|
||||
{
|
||||
Type = "SyncAssetTask",
|
||||
Asset = "juno"
|
||||
},
|
||||
{
|
||||
Type = "SyncAssetTask",
|
||||
Asset = "osirisrex"
|
||||
},
|
||||
{
|
||||
Type = "SyncAssetTask",
|
||||
Asset = "voyager"
|
||||
},
|
||||
{
|
||||
Type = "SyncAssetTask",
|
||||
Asset = "everything"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user