Merge resolve

modules/skybrowser/skybrowsermodule.cpp

@@ -23,8 +23,18 @@
  ****************************************************************************************/
 
 #include <modules/skybrowser/skybrowsermodule.h>
+
+ //#include <modules/webbrowser/webbrowsermodule.h>
+ //#include <modules/webbrowser/include/screenspacebrowser.h>
+#include <modules/base/rendering/screenspaceimagelocal.h>
+#include <openspace/rendering/screenspacerenderable.h>
+
+#include <openspace/rendering/renderable.h>
+#include <openspace/rendering/renderengine.h>
+
 #include <openspace/engine/moduleengine.h>
 
+
 #include <openspace/engine/globals.h>
 #include <openspace/engine/globalscallbacks.h>
 #include <openspace/interaction/navigationhandler.h>
@@ -144,6 +154,7 @@ bool SkybrowserModule::sendMessageToWWT(const ghoul::Dictionary& msg) {
 }
 
 void SkybrowserModule::WWTfollowCamera() {
+    showTarget();
     while (true) {
         // Get camera view direction
         const glm::dvec3 viewDirection = global::navigationHandler->camera()->viewDirectionWorldSpace();

modules/skybrowser/skybrowsermodule.h

@@ -46,6 +46,8 @@ public:
 
     float zoomFactor() const;
     glm::dvec2 convertGalacticToCelestial(glm::dvec3 coords) const;
+
+    void showTarget() const;
     void WWTfollowCamera();
     void showTarget() const;
 

modules/skybrowser/skybrowsermodule_lua.inl

@@ -54,14 +54,11 @@ namespace openspace::skybrowser::luascriptfunctions {
     int moveBrowser(lua_State* L) {
         ghoul::lua::checkArgumentsAndThrow(L, 0, "lua::moveBrowser");
         
-        
         SkybrowserModule* module = global::moduleEngine->module<SkybrowserModule>();     
         ScreenSpaceBrowser* browser = dynamic_cast<ScreenSpaceBrowser*>(global::renderEngine->screenSpaceRenderable("ScreenSpaceBowser"));
-        module->initializeBrowser(browser);
-        
-        module->skyBrowser()->setFaceCameraPropertyToFalse();
+        module->initializeBrowser(browser);     
         module->skyBrowser()->translate(glm::vec3(-0.8, -0.4, 0.0));
-       
+
         return 1;
     }
 
@@ -70,24 +67,30 @@ namespace openspace::skybrowser::luascriptfunctions {
         SkybrowserModule* module = global::moduleEngine->module<SkybrowserModule>();
 
 
-        //std::string _url = "https://wallpaperaccess.com/full/3010132.jpg";
-        // 'https://cdn.wallpapersafari.com/6/92/0nbCPw.jpg'
-
         using namespace std::string_literals;
 
+        std::string node = "{"
+            "Type = 'ScreenSpaceBrowser',"
+            "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);
 
-       // node.setValue("Dimensions", "glm::ivec2(1000, 1000)");
+        */
 
         openspace::global::scriptEngine->queueScript(
-            "openspace.addScreenSpaceRenderable(" + ghoul::formatLua(node) + ")",
+            "openspace.addScreenSpaceRenderable(" + node + ")",
             scripting::ScriptEngine::RemoteScripting::Yes
-        );     
-        
+        );
+
         return 1;
     }
     

modules/webbrowser/include/screenspacebrowser.h

@@ -74,7 +74,6 @@ public:
 
     void executeJavascript(std::string &script) const;
     void translate(glm::vec3 translation);
-    void setFaceCameraPropertyToFalse();
 
 private:
     class ScreenSpaceRenderHandler : public WebRenderHandler {

modules/webbrowser/src/screenspacebrowser.cpp

@@ -71,10 +71,6 @@ 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() {}