diff --git a/modules/skybrowser/CMakeLists.txt b/modules/skybrowser/CMakeLists.txt index 04c490df01..7157b0828f 100644 --- a/modules/skybrowser/CMakeLists.txt +++ b/modules/skybrowser/CMakeLists.txt @@ -24,8 +24,6 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) - - set(HEADER_FILES skybrowsermodule.h @@ -37,7 +35,6 @@ set(SOURCE_FILES skybrowsermodule.cpp skybrowsermodule_lua.inl - ) source_group("Source Files" FILES ${SOURCE_FILES}) diff --git a/modules/skybrowser/include.cmake b/modules/skybrowser/include.cmake new file mode 100644 index 0000000000..83fdb5ae82 --- /dev/null +++ b/modules/skybrowser/include.cmake @@ -0,0 +1,4 @@ +set(DEFAULT_MODULE ON) +set(OPENSPACE_DEPENDENCIES + webbrowser +) diff --git a/modules/skybrowser/skybrowsermodule.cpp b/modules/skybrowser/skybrowsermodule.cpp index 9a8c1c2c55..86954f46df 100644 --- a/modules/skybrowser/skybrowsermodule.cpp +++ b/modules/skybrowser/skybrowsermodule.cpp @@ -23,6 +23,8 @@ ****************************************************************************************/ #include + //#include + //#include #include @@ -87,10 +89,11 @@ scripting::LuaLibrary SkybrowserModule::luaLibrary() const { void SkybrowserModule::internalInitialize(const ghoul::Dictionary& dict) { const Parameters p = codegen::bake(dict); _testProperty = p.testString.value_or(_testProperty); - + /* auto fBrowser = FactoryManager::ref().factory(); ghoul_assert(fBrowser, "No browser factory existed :'-("); fBrowser->registerClass("ScreenSpaceBrowser"); + */ } /* std::vector SkybrowserModule::documentations() const { diff --git a/modules/skybrowser/skybrowsermodule.h b/modules/skybrowser/skybrowsermodule.h index 6b4eb302ea..49cba25bb7 100644 --- a/modules/skybrowser/skybrowsermodule.h +++ b/modules/skybrowser/skybrowsermodule.h @@ -27,8 +27,7 @@ #include -#include -#include + #include #include diff --git a/modules/skybrowser/skybrowsermodule_lua.inl b/modules/skybrowser/skybrowsermodule_lua.inl index 676ee684f4..9a6ae8a79f 100644 --- a/modules/skybrowser/skybrowsermodule_lua.inl +++ b/modules/skybrowser/skybrowsermodule_lua.inl @@ -64,12 +64,12 @@ namespace openspace::skybrowser::luascriptfunctions { node.setValue("Renderable", renderable); node.setValue("GUI", gui); - + */ openspace::global::scriptEngine->queueScript( - "openspace.addSceneGraphNode(" + ghoul::formatLua(node) + ")", + "openspace.addScreenSpaceRenderable(" + ghoul::formatLua(node) + ")", scripting::ScriptEngine::RemoteScripting::Yes ); - */ + return 1; }