mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 12:39:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge resolve

Browse Source
This commit is contained in:
Ester Lindgren
2021-03-11 10:10:26 +01:00
parent 8a0e9e6ed0 c32c1fff6a
commit fc3fa859af
141 changed files with 37500 additions and 16300 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/skybrowser/skybrowsermodule_lua.inl
+3 -9
View File
@@ -46,11 +46,9 @@ namespace openspace::skybrowser::luascriptfunctions {
SkyBrowserModule* module = global::moduleEngine->module<SkyBrowserModule>();
//ghoul::Dictionary message = module->createMessageForPausingWWTTime();
//module->sendMessageToWWT(message);
std::thread thread(&SkyBrowserModule::WWTfollowCamera, module);
thread.detach();
module->WWTfollowCamera();
module->handleInteractions();
return 1;
}
@@ -59,7 +57,6 @@ namespace openspace::skybrowser::luascriptfunctions {
SkyBrowserModule* module = global::moduleEngine->module<SkyBrowserModule>();
ScreenSpaceSkyBrowser* browser = dynamic_cast<ScreenSpaceSkyBrowser*>(global::renderEngine->screenSpaceRenderable("ScreenSpaceBowser"));
module->initializeBrowser(browser);
module->skyBrowser()->translate(glm::vec3(-0.8, -0.4, 0.0));
module->checkIfTargetExist();
@@ -68,7 +65,6 @@ namespace openspace::skybrowser::luascriptfunctions {
}
int createBrowser(lua_State* L) {
ghoul::lua::checkArgumentsAndThrow(L, 0, "lua::createBrowser");
SkyBrowserModule* module = global::moduleEngine->module<SkyBrowserModule>();
@@ -89,9 +85,7 @@ namespace openspace::skybrowser::luascriptfunctions {
node.setValue("Identifier", "ScreenSpaceBowser"s);
node.setValue("Name", "Screen Space Bowser"s);
node.setValue("Url", "http://localhost:8000/"s);
*/
openspace::global::scriptEngine->queueScript(
"openspace.addScreenSpaceRenderable(" + node + ")",
scripting::ScriptEngine::RemoteScripting::Yes