mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-26 22:19:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

Browse Source 
Conflicts:
	data/scene/default.scene
	modules/sync/syncmodule.h
	openspace.cfg
	src/engine/openspaceengine.cpp
	src/scene/scene.cpp
	src/scene/scene_doc.inl
	src/scene/scenegraphnode.cpp
	src/scene/scenegraphnode_doc.inl
	src/scene/sceneloader.cpp
	src/scripting/scriptengine.cpp
This commit is contained in:
Emil Axelsson
2017-08-14 11:17:25 +02:00
parent 9c3ca2228a 0b063827b8
commit cb7319d5f2
928 changed files with 10516 additions and 10536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/scripting/scriptscheduler.cpp
View File

@@ -39,13 +39,11 @@ namespace {
const char* KeyForwardScript = "ForwardScript";
const char* KeyBackwardScript = "BackwardScript";
const char* KeyUniversalScript = "Script";
}
namespace openspace {
} // namespace
#include "scriptscheduler_lua.inl"
namespace scripting {
namespace openspace::scripting {
documentation::Documentation ScriptScheduler::Documentation() {
using namespace openspace::documentation;
@@ -63,39 +61,39 @@ documentation::Documentation ScriptScheduler::Documentation() {
{
KeyTime,
new TimeVerifier,
Optional::No,
"The time at which, when the in game time passes it, the two "
"scripts will be executed. If the traversal is forwards (towards "
"+ infinity), the ForwardScript will be executed, otherwise the "
"BackwardScript will be executed instead.",
Optional::No
"BackwardScript will be executed instead."
},
{
KeyUniversalScript,
new LuaScriptVerifier,
Optional::Yes,
"The Lua script that will be executed when the specified time is "
"passed independent of its direction. This script will be "
"executed before the specific scripts if both versions are "
"specified",
Optional::Yes
"specified"
},
{
KeyForwardScript,
new LuaScriptVerifier,
Optional::Yes,
"The Lua script that is executed when OpenSpace passes the time "
"in a forward direction.",
Optional::Yes
"in a forward direction."
},
{
KeyBackwardScript,
new LuaScriptVerifier,
Optional::Yes,
"The Lua script that is executed when OpenSpace passes the time "
"in a backward direction.",
Optional::Yes
"in a backward direction."
}
})
}),
Optional::No
}
},
Exhaustive::Yes
}
};
}
@@ -297,6 +295,4 @@ LuaLibrary ScriptScheduler::luaLibrary() {
};
}
} // namespace scripting
} // namespace openspace
} // namespace openspace::scripting