mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-08 04:20:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add function to create browser

Browse Source
This commit is contained in:
Ylva Selling
2021-03-19 09:37:19 +01:00
parent c728c38daa
commit ac4fc926a2
3 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/skybrowser/skybrowsermodule.cpp
+29
View File
@@ -430,6 +430,35 @@ void SkyBrowserModule::createTarget() {
}
void SkyBrowserModule::createBrowser() {
SkyBrowserModule* module = global::moduleEngine->module<SkyBrowserModule>();
using namespace std::string_literals;
std::string node = "{"
"Type = 'ScreenSpaceSkyBrowser',"
"Identifier = 'ScreenSpaceBowser',"
"Name = 'Screen Space Bowser',"
"Url = 'http://localhost:8000/',"
"FaceCamera = false"
"}";
/*
ghoul::Dictionary node;
node.setValue("Type", "ScreenSpaceBrowser"s);
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
);
}
/*
std::vector<documentation::Documentation> SkyBrowserModule::documentations() const {
return {
modules/skybrowser/skybrowsermodule.h
+1
View File
@@ -53,6 +53,7 @@ public:
// target
void createTarget();
void createBrowser();
ghoul::Dictionary createMessageForMovingWWTCamera(const glm::dvec2 celestCoords, const float fov, const bool moveInstantly = true) const;
ghoul::Dictionary createMessageForPausingWWTTime() const;
modules/skybrowser/skybrowsermodule_lua.inl
+3 -22
View File
@@ -67,28 +67,9 @@ namespace openspace::skybrowser::luascriptfunctions {
ghoul::lua::checkArgumentsAndThrow(L, 0, "lua::createBrowser");
SkyBrowserModule* module = global::moduleEngine->module<SkyBrowserModule>();
using namespace std::string_literals;
std::string node = "{"
"Type = 'ScreenSpaceSkyBrowser',"
"Identifier = 'ScreenSpaceBowser',"
"Name = 'Screen Space Bowser',"
"Url = 'http://localhost:8000/',"
"FaceCamera = false"
"}";
/*
ghoul::Dictionary node;
node.setValue("Type", "ScreenSpaceBrowser"s);
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
);
module->createBrowser();
module->createTarget();
return 1;
}