More explicit scheduled script helpers and set osiris rex trails enabled values at launch

This commit is contained in:
Erik Broberg
2016-08-30 15:37:33 -04:00
parent a50cb8d06a
commit af5c0c71e8
3 changed files with 26 additions and 12 deletions

View File

@@ -167,7 +167,7 @@ function preInitialization()
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);
-- openspace.scriptScheduler.skipTo(startTime);
end

View File

@@ -3,11 +3,14 @@ dofile(openspace.absPath('${SCRIPTS}/common.lua'))
return
{
helper.scheduledScript.enable("2016 SEP 08 23:05:01", "OsirisRexTrailEarth", true),
helper.scheduledScript.enable("2016 SEP 09 00:00:00", "OsirisRexTrailSolarSystem", true),
helper.scheduledScript.enable("2016 SEP 09 02:00:00", "OsirisRexTrailEarth", false),
helper.scheduledScript.enable("2018 OCT 11 00:00:00", "OsirisRexTrailBennu", true),
helper.scheduledScript.enable("2018 OCT 15 00:00:00", "OsirisRexTrailSolarSystem", false),
helper.scheduledScript.enable("2019 AUG 01 00:00:00", "OsirisRexTrailSolarSystem", true),
helper.scheduledScript.enable("2019 AUG 01 00:00:00", "OsirisRexTrailBennu", false),
helper.scheduledScript.setEnabled("2016 SEP 08 23:05:00", "OsirisRexTrailSolarSystem", false),
helper.scheduledScript.setEnabled("2016 SEP 08 23:05:00", "OsirisRexTrailBennu", false),
helper.scheduledScript.reversible.setEnabled("2016 SEP 08 23:05:01", "OsirisRexTrailEarth", true),
helper.scheduledScript.reversible.setEnabled("2016 SEP 09 00:00:00", "OsirisRexTrailSolarSystem", true),
helper.scheduledScript.reversible.setEnabled("2016 SEP 09 02:00:00", "OsirisRexTrailEarth", false),
helper.scheduledScript.reversible.setEnabled("2018 OCT 11 00:00:00", "OsirisRexTrailBennu", true),
helper.scheduledScript.reversible.setEnabled("2018 OCT 15 00:00:00", "OsirisRexTrailSolarSystem", false),
helper.scheduledScript.reversible.setEnabled("2019 AUG 01 00:00:00", "OsirisRexTrailSolarSystem", true),
helper.scheduledScript.reversible.setEnabled("2019 AUG 01 00:00:00", "OsirisRexTrailBennu", false),
}

View File

@@ -7,6 +7,7 @@ helper.property = {}
-- These helpers are for scheduling lua scripts
-- See class ScriptScheduler and ScheduledScript for reference
helper.scheduledScript = {}
helper.scheduledScript.reversible = {}
-- Function that sets the most common key bindings that are common to most (all?)
-- scenes
@@ -75,20 +76,30 @@ helper.renderable.toggle = function(renderable)
end
-- Function that returns the string that sets the enabled property of <renderable> to <enabled>
helper.renderable.enable = function(renderable, enabled)
helper.renderable.setEnabled = function(renderable, enabled)
return "openspace.setPropertyValue('" .. renderable .. ".renderable.enabled', " .. (enabled and "true" or "false") .. ");";
end
-- Function that returns a lua table specifying a reversible ScheduledScript for
-- setting the enabled property of <renderable> to <enabled> at time <time>.
helper.scheduledScript.enable = function(time, renderable, enabled)
helper.scheduledScript.reversible.setEnabled = function(time, renderable, enabled)
return
{
Time = time,
ReversibleLuaScript = {
Forward = helper.renderable.enable(renderable, enabled),
Backward = helper.renderable.enable(renderable, not enabled)
Forward = helper.renderable.setEnabled(renderable, enabled),
Backward = helper.renderable.setEnabled(renderable, not enabled)
}
}
end
helper.scheduledScript.setEnabled = function(time, renderable, enabled)
return
{
Time = time,
ReversibleLuaScript = {
Forward = helper.renderable.setEnabled(renderable, enabled),
Backward = ""
}
}
end