diff --git a/modules/skybrowser/skybrowsermodule_lua.inl b/modules/skybrowser/skybrowsermodule_lua.inl index eecd415ca6..d43d89fa6b 100644 --- a/modules/skybrowser/skybrowsermodule_lua.inl +++ b/modules/skybrowser/skybrowsermodule_lua.inl @@ -29,16 +29,17 @@ namespace openspace::skybrowser::luascriptfunctions { int followCamera(lua_State* L) { ghoul::lua::checkArgumentsAndThrow(L, 0, "lua::followCamera"); - const SkybrowserModule* module = global::moduleEngine->module(); - module->WWTfollowCamera(); - + ScreenSpaceBrowser* browser = dynamic_cast(global::renderEngine->screenSpaceRenderable("ScreenSpaceBowser")); + + module->WWTfollowCamera(); return 1; } int moveBrowser(lua_State* L) { ghoul::lua::checkArgumentsAndThrow(L, 0, "lua::moveBrowser"); ScreenSpaceBrowser* browser = dynamic_cast(global::renderEngine->screenSpaceRenderable("ScreenSpaceBowser")); + browser->setFaceCameraPropertyToFalse(); browser->translate(glm::vec3(-0.8, -0.4, 0.0)); return 1; } @@ -47,7 +48,7 @@ namespace openspace::skybrowser::luascriptfunctions { ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::createBrowser"); ghoul::lua::value(L, 1); - const SkybrowserModule* module = global::moduleEngine->module(); + const SkybrowserModule* module = global::moduleEngine->module(); //std::string _url = "https://wallpaperaccess.com/full/3010132.jpg"; // 'https://cdn.wallpapersafari.com/6/92/0nbCPw.jpg' @@ -58,7 +59,7 @@ namespace openspace::skybrowser::luascriptfunctions { node.setValue("Type", "ScreenSpaceBrowser"s); node.setValue("Identifier", "ScreenSpaceBowser"s); node.setValue("Name", "Screen Space Bowser"s); - node.setValue("Url", "http://localhost:7800/sky_browser/index.html"s); + node.setValue("Url", "http://localhost:8000/"s); // node.setValue("Dimensions", "glm::ivec2(1000, 1000)"); openspace::global::scriptEngine->queueScript( diff --git a/modules/webbrowser/include/screenspacebrowser.h b/modules/webbrowser/include/screenspacebrowser.h index 514d989043..f9c35beec6 100644 --- a/modules/webbrowser/include/screenspacebrowser.h +++ b/modules/webbrowser/include/screenspacebrowser.h @@ -74,6 +74,7 @@ public: void executeJavascript(std::string &script) const; void translate(glm::vec3 translation); + void setFaceCameraPropertyToFalse(); private: class ScreenSpaceRenderHandler : public WebRenderHandler { diff --git a/modules/webbrowser/src/screenspacebrowser.cpp b/modules/webbrowser/src/screenspacebrowser.cpp index dcdee6a601..c21d36ed7d 100644 --- a/modules/webbrowser/src/screenspacebrowser.cpp +++ b/modules/webbrowser/src/screenspacebrowser.cpp @@ -71,6 +71,10 @@ void ScreenSpaceBrowser::translate(glm::vec3 translation) { _cartesianPosition = glm::translate(glm::mat4(1.f), translation) * glm::vec4(position, 1.0f); } +void ScreenSpaceBrowser::setFaceCameraPropertyToFalse() { + _faceCamera = false; +} + void ScreenSpaceBrowser::ScreenSpaceRenderHandler::draw() {} void ScreenSpaceBrowser::ScreenSpaceRenderHandler::render() {}