Remove sky browser properties from the screen space renderables

modules/skybrowser/include/screenspaceskybrowser.h

@@ -39,6 +39,7 @@ namespace openspace {
         void setVerticalFovWithScroll(float scroll);
         void setOpacity(float opacity);
         void setScreenSpaceSize(const glm::vec2& newSize);
+        void updateScreenSpaceSize();
 
         glm::dvec2 fineTuneVector(glm::dvec2 drag);
         void setIdInBrowser();
@@ -48,7 +49,6 @@ namespace openspace {
     private:
         properties::DoubleProperty _animationSpeed;
         properties::FloatProperty _textureQuality;
-        properties::Vec2Property _size;
 
         void bindTexture() override;
 
@@ -60,6 +60,7 @@ namespace openspace {
 
         // Animation of fieldOfView
         float _endVfov{ 0.f };
+        glm::vec2 _size{ 0.5f };
     };
 }
 

modules/skybrowser/include/screenspaceskytarget.h

@@ -96,7 +96,7 @@ namespace openspace {
         glm::dvec3 _animationStart;      // Cartesian equatorial coordinates
         
         // Time variables
-        // For capping the set equatorial coordinates to sky browser
+        // For capping sending of equatorial coordinates to sky browser
         const std::chrono::microseconds interval = std::chrono::microseconds(10000);
         std::chrono::time_point<std::chrono::high_resolution_clock> latestCall;
         constexpr static const std::chrono::milliseconds _timeUpdateInterval{ 10 };

modules/skybrowser/include/wwtcommunicator.h

@@ -80,9 +80,9 @@ protected:
     // Web page communication
     void setIdInBrowser(const std::string& id);
 
-    properties::DVec2Property _equatorialAim;
-    properties::FloatProperty _verticalFov;
-    properties::IVec3Property _borderColor;
+    glm::dvec2 _equatorialAim;
+    float _verticalFov{ 10.f };
+    glm::ivec3 _borderColor;
 
     std::deque<int> _selectedImages;
     bool _hasLoadedImages{ false };

modules/skybrowser/skybrowsermodule_lua.inl

@@ -8,26 +8,11 @@
 #include <openspace/rendering/renderengine.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
-#include <glm/gtx/color_space.hpp> // For hsv color
-#include <random> // For random color
 
 namespace {
 	constexpr const char _loggerCat[] = "SkyBrowserModule";
 } // namespace
 
-glm::ivec3 randomBorderColor() {
-    // Generate a random border color with sufficient lightness and a n
-    std::random_device rd;
-    // Hue is in the unit degrees [0, 360]
-    std::uniform_real_distribution<float> hue(0.f, 360.f);
-    // Value in saturation are in the unit percent [0,1]
-    float value = 0.95f; // Brightness
-    float saturation = 0.5f;
-    glm::vec3 hsvColor = glm::vec3(hue(rd), saturation, value);
-    glm::ivec3 rgbColor = glm::ivec3(glm::rgbColor(hsvColor) * 255.f);
-    return rgbColor;
-}
-
 namespace openspace::skybrowser::luascriptfunctions {
 
 int selectImage(lua_State* L) {
@@ -535,7 +520,6 @@ int createTargetBrowserPair(lua_State* L) {
     //std::string url = "https://data.openspaceproject.com/dist/skybrowser/page/";
     std::string url = "http://localhost:8000"; // check webgl version
     //std::string url = "https://get.webgl.org";
-    glm::ivec3 color = randomBorderColor();
 
     const std::string browser = "{"
         "Identifier = '" + idBrowser + "',"
@@ -543,8 +527,7 @@ int createTargetBrowserPair(lua_State* L) {
         "Name = '" + nameBrowser + "',"
         "Url = '" + url + "',"
         "FaceCamera = false,"
-        "CartesianPosition = " + ghoul::to_string(positionBrowser) + ","
-        "BorderColor = " + ghoul::to_string(color) + ","
+        "CartesianPosition = " + ghoul::to_string(positionBrowser) +
         "}";
     const std::string target = "{"
         "Identifier = '" + idTarget + "',"

modules/skybrowser/src/renderableskybrowser.cpp

@@ -74,9 +74,6 @@ namespace openspace {
         addProperty(_url);
         addProperty(_browserPixeldimensions);
         addProperty(_reload);
-        addProperty(_verticalFov);
-        addProperty(_borderColor);
-        addProperty(_equatorialAim);
     }
 
     RenderableSkyBrowser::~RenderableSkyBrowser() {

modules/skybrowser/src/screenspaceskybrowser.cpp

@@ -10,24 +10,14 @@
 #include <ghoul/misc/dictionaryjsonformatter.h> // formatJson
 #include <ghoul/opengl/texture.h>
 #include <optional>
+#include <glm/gtx/color_space.hpp> // For hsv color
+#include <random> // For random color
 
 #include <glm/gtx/string_cast.hpp>
 #pragma optimize("", off)
 namespace {
     constexpr const char* _loggerCat = "ScreenSpaceSkyBrowser";
 
-    constexpr const openspace::properties::Property::PropertyInfo BorderColorInfo =
-    {
-        "BorderColor",
-        "Border Color",
-        "The color of the border of the sky browser."
-    };
-    constexpr const openspace::properties::Property::PropertyInfo VerticalFovInfo =
-    {
-        "VerticalFieldOfView",
-        "Vertical Field Of View",
-        "The vertical field of view in degrees."
-    };
     constexpr const openspace::properties::Property::PropertyInfo AnimationSpeedInfo =
     {
         "AnimationSpeed",
@@ -42,35 +32,32 @@ namespace {
         "slower framerate. Lower value means lower resolution of texture and faster "
         "frame rate."
     };
-    constexpr const openspace::properties::Property::PropertyInfo SizeInfo =
-    {
-        "Size",
-        "Screen space size of the sky browser",
-        "The size of the sky browser determines how large is on screen. The y parameter "
-        "determines the percentage of the screen the browser will cover in the "
-        "y-direction. The x parameter determines how large the sky browser will be in "
-        "the x direction."
-    };
-
 
     struct [[codegen::Dictionary(ScreenSpaceSkyBrowser)]] Parameters {
 
-        // [[codegen::verbatim(VerticalFovInfo.description)]]
-        std::optional<float> verticalFov;
-
-        // [[codegen::verbatim(BorderColorInfo.description)]]
-        std::optional<glm::ivec3> borderColor;
-
         // [[codegen::verbatim(AnimationSpeedInfo.description)]]
         std::optional<double> animationSpeed;
 
         // [[codegen::verbatim(TextureQualityInfo.description)]]
-        std::optional<double> textureQuality;
+        std::optional<float> textureQuality;
     };
 
 #include "ScreenSpaceSkyBrowser_codegen.cpp"
 } // namespace
 
+glm::ivec3 randomBorderColor() {
+    // Generate a random border color with sufficient lightness and a n
+    std::random_device rd;
+    // Hue is in the unit degrees [0, 360]
+    std::uniform_real_distribution<float> hue(0.f, 360.f);
+    // Value in saturation are in the unit percent [0,1]
+    float value = 0.95f; // Brightness
+    float saturation = 0.5f;
+    glm::vec3 hsvColor = glm::vec3(hue(rd), saturation, value);
+    glm::ivec3 rgbColor = glm::ivec3(glm::rgbColor(hsvColor) * 255.f);
+    return rgbColor;
+}
+
 namespace openspace {
 
     ScreenSpaceSkyBrowser::ScreenSpaceSkyBrowser(const ghoul::Dictionary& dictionary)
@@ -78,7 +65,6 @@ namespace openspace {
         , WwtCommunicator(dictionary)
         , _animationSpeed(AnimationSpeedInfo, 5.0, 0.1, 10.0)
         , _textureQuality(TextureQualityInfo, 1.f, 0.25f, 1.f)
-        , _size(SizeInfo, glm::vec2(0.5f), glm::vec2(0.f), glm::vec2(2.f))
     {
         // Set a unique identifier
         std::string identifier;
@@ -91,35 +77,25 @@ namespace openspace {
         identifier = makeUniqueIdentifier(identifier);
         setIdentifier(identifier);
 
-        // Make the color property display a color picker in the GUI
-        _borderColor.setViewOption(properties::Property::ViewOptions::Color, true);
-
         // Handle target dimension property
         const Parameters p = codegen::bake<Parameters>(dictionary);
-        _verticalFov = p.verticalFov.value_or(_verticalFov);
-        _borderColor = p.borderColor.value_or(_borderColor);
         _textureQuality = p.textureQuality.value_or(_textureQuality);
+        _animationSpeed = p.animationSpeed.value_or(_animationSpeed);
 
         addProperty(_url);
         addProperty(_browserPixeldimensions);
         addProperty(_reload);
-        addProperty(_verticalFov);
-        addProperty(_borderColor);
-        addProperty(_equatorialAim);
         addProperty(_textureQuality);
-        addProperty(_size);
 
         _textureQuality.onChange([this]() {
             _textureDimensionsIsDirty = true;
             });        
-        _size.onChange([this]() {
-            _sizeIsDirty = true;
-            });
 
         // Ensure that the browser is placed at the z-coordinate of the screen space plane
         glm::vec2 screenPosition = _cartesianPosition.value();
-        _cartesianPosition.setValue(glm::vec3(screenPosition, skybrowser::ScreenSpaceZ));
-        
+        _cartesianPosition.setValue(glm::vec3(screenPosition, skybrowser::ScreenSpaceZ)); 
+
+        _borderColor = randomBorderColor();
     }
 
     ScreenSpaceSkyBrowser::~ScreenSpaceSkyBrowser() {
@@ -165,7 +141,8 @@ namespace openspace {
            
         // If the scale is 1, it covers half the window. Hence multiplication with 2
         float newResY = pixels.y * 2.f * _scale; 
-        float newResX = newResY * (_browserPixeldimensions.value().x / _browserPixeldimensions.value().y);
+        float ratio = _size.x / _size.y;
+        float newResX = newResY * ratio;
         glm::vec2 newSize = glm::vec2(newResX , newResY) * _textureQuality.value();
 
         _browserPixeldimensions = glm::ivec2(newSize);
@@ -225,10 +202,9 @@ namespace openspace {
             _textureDimensionsIsDirty = false;
         }
         if (_sizeIsDirty) {
-            setScreenSpaceSize(_size);
+            updateScreenSpaceSize();
             _sizeIsDirty = false;
         }
-        _objectSize = _texture->dimensions();
 
         WwtCommunicator::update();
         ScreenSpaceRenderable::update();
@@ -267,20 +243,15 @@ namespace openspace {
 
     void ScreenSpaceSkyBrowser::setScreenSpaceSize(const glm::vec2& newSize)
     {   
-        
-        _scale = abs(newSize.y) * 0.5f;
-        glm::vec2 newSizeRelToOld = abs((screenSpaceDimensions() + newSize) /
-            screenSpaceDimensions());
-        glm::vec2 newDimensions = newSizeRelToOld * glm::vec2(_texture->dimensions());
-        // Scale the browser
-        // Scale on the y axis, this is to ensure that _scale = 1 is
-        // equal to the height of the window
-        _browserPixeldimensions = glm::ivec2(newDimensions);
-        _texture->setDimensions(glm::ivec3(newDimensions, 1));
-        _objectSize = _texture->dimensions();
-
-        updateTextureResolution();
         _size = newSize;
+        _sizeIsDirty = true;
+    }
+
+    void ScreenSpaceSkyBrowser::updateScreenSpaceSize()
+    {
+        _scale = abs(_size.y) * 0.5f;
+        updateTextureResolution();
+        _objectSize = _texture->dimensions();
     }
 
     float ScreenSpaceSkyBrowser::opacity() const {

modules/skybrowser/src/wwtcommunicator.cpp

@@ -37,41 +37,13 @@
 namespace {
     constexpr const char* _loggerCat = "WwtCommunicator";
 
-    constexpr const openspace::properties::Property::PropertyInfo BorderColorInfo =
-    {
-        "BorderColor",
-        "Border Color",
-        "The color of the border of the sky browser."
-    };
-    constexpr const openspace::properties::Property::PropertyInfo VerticalFovInfo =
-    {
-        "VerticalFieldOfView",
-        "Vertical Field Of View",
-        "The vertical field of view in degrees."
-    };
-    constexpr const openspace::properties::Property::PropertyInfo EquatorialAimInfo =
-    {
-        "EquatorialAim",
-        "Equatorial aim of the sky browser",
-        "The aim of the sky browser given in spherical equatorial coordinates right "
-        "ascension (RA) and declination (Dec) in epoch J2000. The unit is degrees."
-    };
 
 } // namespace
 
 namespace openspace {
 
     WwtCommunicator::WwtCommunicator(const ghoul::Dictionary& dictionary)
-        : Browser(dictionary),
-        _verticalFov(VerticalFovInfo, 10.f, 0.01f, 70.0f),
-        _borderColor(BorderColorInfo, glm::ivec3(200), glm::ivec3(0), glm::ivec3(255)),
-        _equatorialAim(EquatorialAimInfo, glm::dvec2(0.0), glm::dvec2(0.0, -90.0), 
-            glm::dvec2(360.0, 90.0))
-    {
-        _borderColor.onChange([this]() {
-            _borderColorIsDirty = true;
-        });
-    }
+        : Browser(dictionary) {}
 
     WwtCommunicator::~WwtCommunicator() {
 
@@ -141,12 +113,12 @@ namespace openspace {
 
     void WwtCommunicator::highlight(glm::ivec3 addition)
     {
-        setWebpageBorderColor(_borderColor.value() + addition);
+        setWebpageBorderColor(_borderColor + addition);
     }
 
     void WwtCommunicator::removeHighlight(glm::ivec3 removal)
     {
-        setWebpageBorderColor(_borderColor.value() - removal);
+        setWebpageBorderColor(_borderColor - removal);
     }
 
     void WwtCommunicator::updateBorderColor()