mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-22 02:48:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Solve merge conflict

Browse Source
This commit is contained in:
Kalle Bladin
2016-08-30 13:12:45 -04:00
parent 357462adac 99309b3cb3
commit 53a626a0ea
8 changed files with 363 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/scene/osirisrex.scene
+12 -4
View File
@@ -158,11 +158,17 @@ function preInitialization()
dofile(openspace.absPath('${SCRIPTS}/bind_keys.lua'))
dofile(openspace.absPath('${SCRIPTS}/bind_keys_osirisrex.lua'))
-- openspace.time.setTime("2018-12-20T22:47:00.00")
--openspace.time.setTime("2019-05-25T03:57:55.00")
openspace.time.setTime("2016 SEP 8 23:05:00.50")
--openspace.time.setTime("2019 APR 16 12:03:00.00")
--local startTime = "2019 APR 16 12:03:00.00"
local startTime = "2016 SEP 8 23:05:00.50"
openspace.time.setTime(startTime)
openspace.time.setDeltaTime(0)
openspace.scriptScheduler.load("${OPENSPACE_DATA}/scene/osirisrex/scheduled_scripts.lua")
-- Removing the line below will cause all scripts prior to <startTime> to be executed during initialization
openspace.scriptScheduler.skipTo(startTime);
end
function postInitialization()
@@ -189,6 +195,8 @@ function postInitialization()
openspace.printInfo("Done setting default values")
openspace.loadMission("${OPENSPACE_DATA}/scene/osirisrex/osirisrex/osirisrex.mission")
openspace.resetCameraDirection()
end
data/scene/osirisrex/osirisrex/osirisrex.mod
+39 -31
View File
@@ -194,35 +194,10 @@ return {
},
},
]]
-- Trail relative to Earth
{
Name = "OsirisRexTrailLocal",
Parent = "BennuBarycenter",
Renderable = {
Type = "RenderableTrailNew",
-- Spice
Body = "OSIRIS-REX",
Frame = "GALACTIC",
Observer = BENNU_BODY,
-- Optional rendering properties
LineColor = { 0.9, 0.2, 0.9 },
PointColor = { 0.9, 0.2, 0.9 },
LineFade = 0.5, -- [0,1]
RenderPart = 0.06,
LineWidth = 2,
ShowTimeStamps = false,
RenderFullTrail = false,
-- Time interval
TimeRange = {
Start = "2016 SEP 8 23:05:00.50",
End = "2023 SEP 24 12:00:00",
},
SampleDeltaTime = 3600, -- Seconds between each point
SubSamples = 3,
},
GuiName = "OsirisRexTrailLocal"
},
{
Name = "OsirisRexTrailGlobal",
Name = "OsirisRexTrailEarth",
Parent = "LodEarth",
Renderable = {
Type = "RenderableTrailNew",
@@ -246,10 +221,12 @@ return {
SampleDeltaTime = 60, -- Seconds between each point
SubSamples = 59,
},
GuiName = "OsirisRexTrailGlobal"
GuiName = "OsirisRexTrailEarth"
},
-- Trail relative to solar system barycenter
{
Name = "OsirisRexTrailSolar",
Name = "OsirisRexTrailSolarSystem",
Parent = "SolarSystemBarycenter",
Renderable = {
Type = "RenderableTrailNew",
@@ -273,6 +250,37 @@ return {
SampleDeltaTime = 3600, -- Seconds between each point
SubSamples = 0,
},
GuiName = "OsirisRexTrailSolar"
GuiName = "OsirisRexTrailSolarSystem"
},
-- Trail relative to Bennu
{
Name = "OsirisRexTrailBennu",
Parent = "BennuBarycenter",
Renderable = {
Type = "RenderableTrailNew",
-- Spice
Body = "OSIRIS-REX",
Frame = "GALACTIC",
Observer = BENNU_BODY,
-- Optional rendering properties
LineColor = { 0.9, 0.2, 0.9 },
PointColor = { 0.9, 0.2, 0.9 },
LineFade = 0.5, -- [0,1]
RenderPart = 0.06,
LineWidth = 2,
ShowTimeStamps = false,
RenderFullTrail = false,
-- Time interval
TimeRange = {
Start = "2016 SEP 8 23:05:00.50",
End = "2023 SEP 24 12:00:00",
},
SampleDeltaTime = 3600, -- Seconds between each point
SubSamples = 3,
},
GuiName = "OsirisRexTrailBennu"
},
}
data/scene/osirisrex/scheduled_scripts.lua
+17
View File
@@ -0,0 +1,17 @@
return
{
{
Time = "2016 SEP 08 23:10:13",
ReversibleLuaScript = {
Forward = "openspace.printInfo('forward test 1');",
Backward = "openspace.printInfo('backward test 1');",
}
},
{
Time = "2016 SEP 09 00:08:13",
ReversibleLuaScript = {
Forward = "openspace.printInfo('forward test 2');",
Backward = "openspace.printInfo('backward test 2');",
}
},
}