Merge branch 'develop' of github.com:OpenSpace/OpenSpace into feature/parallelconnection

Conflicts:
	include/openspace/engine/openspaceengine.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/network/parallelconnection.cpp
	src/scripting/scriptengine.cpp

scripts/bind_keys.lua

@@ -6,10 +6,19 @@ dofile(openspace.absPath('${SCRIPTS}/common.lua'))
 openspace.clearKeys()
 helper.setCommonKeys()
 helper.setDeltaTimeKeys({
-    1, 5, 10, 20, 40, 60, 120, 360, 720, 1440,
-    2880, 5760, 11520, 23040, 46080, 92160, 184320, 368640, 737280, 1474560,
-    2949120, 5898240, 11796480, 23592960, 47185920, 94371840, 188743680, 377487360
+--  1			2		3		4		5		6		7		8		9		0
+--------------------------------------------------------------------------------------------------------------------------
+--  1s            2s 		5s		10s		30s		1m  		2m   		5m   		10m  		30 min
+    1, 		2, 		5, 		10, 		30, 		60, 		120, 		300, 		600, 		1800,
+
+--  1h    		2h    	3h     	6h     	12h    	1d     	2d      	4d      	1w      	2w
+    3600, 		7200, 	10800, 	21600, 	43200, 	86400, 	172800, 	345600, 	604800, 	1209600,
+
+--  1mo      	2mo		3mo      	6mo       	1yr       	2y        	5y         	10y		20y		50y
+    2592000, 	5184000,	7776000, 	15552000, 	31536000, 	63072000, 	157680000, 	315360000, 	630720000,	1576800000
 })
+--  OBS: One month (1mo) is approximated by 30 days.
+
 
 openspace.bindKey("q", helper.renderable.toggle('SunMarker'))
 openspace.bindKey("e", helper.renderable.toggle('EarthMarker'))
@@ -25,4 +34,4 @@ openspace.bindKey("v", "openspace.time.setTime('2015-03-15T02:00:00.00')");
 
 openspace.bindKeyLocal("h", "openspace.parallel.setAddress('127.0.0.2');openspace.parallel.setPort('25001');openspace.parallel.setPassword('test');openspace.parallel.connect();openspace.parallel.requestHostship('test');")
 openspace.bindKeyLocal("c", "openspace.parallel.setAddress('127.0.0.3');openspace.parallel.setPort('25001');openspace.parallel.setPassword('test');openspace.parallel.connect();")
-openspace.bindKeyLocal("d", "openspace.parallel.setAddress('127.0.0.4');openspace.parallel.setPort('25001');openspace.parallel.setPassword('test');openspace.parallel.connect();")
+openspace.bindKeyLocal("d", "openspace.parallel.setAddress('127.0.0.4');openspace.parallel.setPort('25001');openspace.parallel.setPassword('test');openspace.parallel.connect();")

scripts/bind_keys_osirisrex.lua

@@ -0,0 +1,33 @@
+--[[  OpenSpace keybinding script ]]--
+
+-- Load the common helper functions
+dofile(openspace.absPath('${SCRIPTS}/common.lua'))
+
+--openspace.clearKeys()
+--helper.setCommonKeys()
+
+-- Set focuses
+openspace.bindKey("o", "openspace.setPropertyValue('Interaction.origin', 'OsirisRex')")
+openspace.bindKey("b", "openspace.setPropertyValue('Interaction.origin', 'Bennu2')")
+
+
+-- Quickfix backjumps in Osiris rex
+openspace.bindKey("F6" , "openspace.printInfo('Set time: Launch');             openspace.time.setTime('2016 SEP 08 23:05:00');")
+openspace.bindKey("F7" , "openspace.printInfo('Set time: Gravity Assist');     openspace.time.setTime('2017 SEP 22 15:00:00');")
+openspace.bindKey("F8" , "openspace.printInfo('Set time: Approach');           openspace.time.setTime('2018-SEP-11 21:31:01.183');")
+openspace.bindKey("F9" , "openspace.printInfo('Set time: Preliminary Survey'); openspace.time.setTime('2018-NOV-20 01:13:12.183');")
+openspace.bindKey("F10", "openspace.printInfo('Set time: Orbital B');          openspace.time.setTime('2019-APR-08 10:35:27.186');")
+openspace.bindKey("F11", "openspace.printInfo('Set time: Recon');              openspace.time.setTime('2019-MAY-25 03:50:31.195');")
+-- OBS!! Avoid key F12
+-- Pressing F12 triggers a breakpoint on AMNH Windows machine, with with the following stack trace:
+--    ntdll.dll!DbgBreakPoint()
+--    ntdll.dll!DbgUiRemoteBreakin()
+--    kernel32.dll!BaseThreadInitThunk()
+--    ntdll.dll!RtUserThreadStart()
+
+openspace.bindKey("F4", "openspace.scriptScheduler.clear(); openspace.scriptScheduler.load('${OPENSPACE_DATA}/scene/osirisrex/scheduled_scripts.lua');")
+
+openspace.bindKey("q", helper.property.invert('SunMarker.renderable.enabled'))
+openspace.bindKey("e", helper.property.invert('EarthMarker.renderable.enabled'))
+
+openspace.bindKey("c", "openspace.parallel.setAddress('130.236.142.51');openspace.parallel.setPassword('osiris2016');openspace.parallel.connect();")

scripts/bind_keys_rosetta.lua

@@ -22,7 +22,8 @@ openspace.bindKey("F8", "openspace.setPropertyValue('67P.renderable.ProjectionCo
 
 openspace.bindKey("i", helper.renderable.toggle('ImagePlaneRosetta'))
 openspace.bindKey("q", helper.renderable.toggle('SunMarker'))
-openspace.bindKey("e", helper.renderable.toggle('EarthMarker'))
+openspace.bindKey("e", helper.renderable.toggle('JupiterTrail') .. helper.renderable.toggle('SaturnTrail') .. helper.renderable.toggle('UranusTrail') .. helper.renderable.toggle('NeptuneTrail'))
+openspace.bindKey("f", helper.renderable.toggle('PhilaeTrail'))
 
 openspace.bindKeyLocal("h", "openspace.parallel.setAddress('127.0.0.1');openspace.parallel.setPort('25001');openspace.parallel.setPassword('test');openspace.parallel.connect();openspace.parallel.requestHostship('test');")
 openspace.bindKeyLocal("c", "openspace.parallel.setAddress('127.0.0.1');openspace.parallel.setPort('25001');openspace.parallel.setPassword('test');openspace.parallel.connect();")

scripts/common.lua

@@ -4,6 +4,11 @@ helper = {}
 helper.renderable = {}
 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
 helper.setCommonKeys = function()
@@ -70,3 +75,31 @@ helper.renderable.toggle = function(renderable)
     return helper.property.invert(renderable .. ".renderable.enabled")
 end
 
+-- Function that returns the string that sets the enabled property of <renderable> to <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.reversible.setEnabled = function(time, renderable, enabled)
+    return 
+    {
+        Time = time,
+        ReversibleLuaScript = {
+            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