mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-26 06:49:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Feature/pioneer missions (#852)

Browse Source 
* added pioneer assets

* added getDefaultLightSources to assetHelper

* cleanup pioneer assets, fixed issue in voyager2 trails
This commit is contained in:
Micah Acinapura
2019-05-11 16:17:40 +02:00
committed by Alexander Bock
parent 1536eb8f0d
commit a012f8109a
4 changed files with 174 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset Normal file
View File

@@ -0,0 +1,75 @@
local assetHelper = asset.require('util/asset_helper')
local sunTransforms = asset.require('scene/solarsystem/sun/transforms')
local modelFolder = asset.syncedResource({
Name = "Pioneer 10/11 Models",
Type = "HttpSynchronization",
Identifier = "pioneer_10_11_model",
Version = 1
})
local kernelsFolder = asset.syncedResource({
Name = "Pioneer Kernels",
Type = "HttpSynchronization",
Identifier = "pioneer_10_spice",
Version = 1
})
local kernelsList = {kernelsFolder .. '/p10-a.bsp'}
local Pioneer10NAIF = "-23"
local Pioneer10 = {
Identifier = "Pioneer10",
Parent = sunTransforms.SolarSystemBarycenter.Identifier,
Transform = {
Translation = {
Type = "SpiceTranslation",
Target = Pioneer10NAIF,
Observer = "SUN",
Kernels = kernelsList
},
},
Renderable = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = modelFolder .. "/Pioneer.obj"
},
ColorTexture = modelFolder .. "/gray.png",
LightSources = assetHelper.getDefaultLightSources(sunTransforms.SolarSystemBarycenter.Identifier)
},
GUI = {
Name = "Pioneer 10",
Path = "/Solar System/Missions/Pioneer/10"
}
}
local Pioneer10Trail = {
Identifier = "Pioneer10Trail",
Parent = sunTransforms.SolarSystemBarycenter.Identifier,
Renderable = {
Type = "RenderableTrailTrajectory",
Translation = {
Type = "SpiceTranslation",
Target = Pioneer10NAIF,
Observer = "SUN",
Kernels = kernelsList
},
Color = { 0.70, 0.50, 0.20 },
StartTime = "1972 MAR 03 02:04:00",
EndTime = "1990 JAN 02 00:00:00",
EnableFade = false,
SampleInterval = 6545 * 2
-- 6545 is the number of days between the Start and End time (aka sample every 2d)
},
GUI = {
Name = "Pioneer 10 Trail",
Path = "/Solar System/Missions/Pioneer/10"
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, {
Pioneer10,
Pioneer10Trail,
})

78
data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset Normal file
View File

@@ -0,0 +1,78 @@
local assetHelper = asset.require('util/asset_helper')
local sunTransforms = asset.require('scene/solarsystem/sun/transforms')
local modelFolder = asset.syncedResource({
Name = "Pioneer 10/11 Models",
Type = "HttpSynchronization",
Identifier = "pioneer_10_11_model",
Version = 1
})
local kernelsFolder = asset.syncedResource({
Name = "Pioneer Kernels",
Type = "HttpSynchronization",
Identifier = "pioneer_11_spice",
Version = 1
})
local kernelsList = {
kernelsFolder .. '/p11-a.bsp',
kernelsFolder .. '/p11_sat336.bsp'
}
local Pioneer11NAIF = "-24"
local Pioneer11 = {
Identifier = "Pioneer_11",
Parent = sunTransforms.SolarSystemBarycenter.Identifier,
Transform = {
Translation = {
Type = "SpiceTranslation",
Target = Pioneer11NAIF,
Observer = "SUN",
Kernels = kernelsList
},
},
Renderable = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = modelFolder .. "/Pioneer.obj"
},
ColorTexture = modelFolder .. "/gray.png",
LightSources = assetHelper.getDefaultLightSources(sunTransforms.SolarSystemBarycenter.Identifier)
},
GUI = {
Name = "Pioneer 11",
Path = "/Solar System/Missions/Pioneer/11"
}
}
local Pioneer11Trail = {
Identifier = "Pioneer11Trail",
Parent = sunTransforms.SolarSystemBarycenter.Identifier,
Renderable = {
Type = "RenderableTrailTrajectory",
Translation = {
Type = "SpiceTranslation",
Target = Pioneer11NAIF,
Observer = "SUN",
Kernels = kernelsList
},
Color = { 0.70, 0.50, 0.20 },
StartTime = "1973 APR 06 02:25:00.000",
EndTime = "1990 JAN 02 00:00:00.000",
EnableFade = false,
SampleInterval = 6087 * 2
--6087 is the number of days between the Start and End time (so sample every 2d)
},
GUI = {
Name = "Pioneer 11 Trail",
Path = "/Solar System/Missions/Pioneer/11"
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, {
Pioneer11,
Pioneer11Trail,
})

2
data/assets/scene/solarsystem/missions/voyager/voyager2.asset
View File

@@ -205,7 +205,7 @@ local VoyagerTrailEncounterSaturn = {
}
}
local VoyagerTrailSaturnUranus = {
local VoyagerTrailCruiseSaturnUranus = {
Identifier = "Voyager_2_Trail_Cruise_Saturn_Uranus",
Parent = sunTransforms.SolarSystemBarycenter.Identifier,
Renderable = {

20
data/assets/util/asset_helper.asset
View File

@@ -130,6 +130,25 @@ local requestAll = function (sceneAsset, directory)
end
end
local getDefaultLightSources = function (solarSystemBarycenterIdentifier)
local sourceList = {
{
Type = "SceneGraphLightSource",
Identifier = "Sun",
Node = solarSystemBarycenterIdentifier,
Intensity = 1.0
},
{
Identifier = "Camera",
Type = "CameraLightSource",
Intensity = 0.5
}
}
return sourceList
end
asset.export("registerSceneGraphNodes", registerSceneGraphNodes)
asset.export("registerSceneGraphNodesAndExport", registerSceneGraphNodesAndExport)
asset.export("registerSpiceKernels", registerSpiceKernels)
@@ -137,3 +156,4 @@ asset.export("registerDashboardItems", registerDashboardItems)
asset.export("registerInterestingNodes", registerInterestingNodes)
asset.export("requireAll", requireAll)
asset.export("requestAll", requestAll)
asset.export("getDefaultLightSources", getDefaultLightSources)