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/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