From 4063a49297cbcb34ce3f895367f91cb962d2d59f Mon Sep 17 00:00:00 2001 From: Ylva Selling Date: Wed, 30 Mar 2022 14:48:36 -0400 Subject: [PATCH] Change browser and targets starting position. Make browser larger than target by default --- modules/skybrowser/include/screenspaceskybrowser.h | 2 +- modules/skybrowser/skybrowsermodule_lua.inl | 6 +++--- modules/skybrowser/src/screenspaceskybrowser.cpp | 1 + modules/skybrowser/src/targetbrowserpair.cpp | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/skybrowser/include/screenspaceskybrowser.h b/modules/skybrowser/include/screenspaceskybrowser.h index a56bce98db..8599f3355e 100644 --- a/modules/skybrowser/include/screenspaceskybrowser.h +++ b/modules/skybrowser/include/screenspaceskybrowser.h @@ -85,9 +85,9 @@ private: bool _textureDimensionsIsDirty = false; bool _sizeIsDirty = false; + glm::vec2 _size = glm::vec2(1.f, 0.8f); // Animation of fieldOfView double _endVfov = 0.0; - glm::vec2 _size = glm::vec2(0.5f); }; } // namespace openspace diff --git a/modules/skybrowser/skybrowsermodule_lua.inl b/modules/skybrowser/skybrowsermodule_lua.inl index ecb13b8736..2064279aec 100644 --- a/modules/skybrowser/skybrowsermodule_lua.inl +++ b/modules/skybrowser/skybrowsermodule_lua.inl @@ -392,10 +392,10 @@ namespace { std::string idBrowser = "SkyBrowser" + std::to_string(noOfPairs); std::string idTarget = "SkyTarget" + std::to_string(noOfPairs); // Determine starting point on screen for the target - glm::vec3 positionBrowser = { -1.0f, -0.5f, -2.1f }; - glm::vec3 positionTarget = { 1.0f, 0.5f, -2.1f }; + glm::vec3 positionBrowser = { -1.f, -0.5f, -2.1f }; + glm::vec3 positionTarget = { 0.9f, 0.4f, -2.1f }; glm::dvec3 galacticTarget = skybrowser::localCameraToGalactic(positionTarget); - std::string guiPath = "/SkyBrowser"; + std::string guiPath = "/Sky Browser"; std::string url = "https://data.openspaceproject.com/dist/skybrowser/page/"; double fov = 70.0; double size = skybrowser::sizeFromFov(fov, galacticTarget); diff --git a/modules/skybrowser/src/screenspaceskybrowser.cpp b/modules/skybrowser/src/screenspaceskybrowser.cpp index d51d20b4d4..c3af9c7111 100644 --- a/modules/skybrowser/src/screenspaceskybrowser.cpp +++ b/modules/skybrowser/src/screenspaceskybrowser.cpp @@ -137,6 +137,7 @@ namespace openspace { SkyBrowserModule* module = global::moduleEngine->module(); _borderColor = randomBorderColor(module->highlight()); } + _scale = _size.y * 0.5; } ScreenSpaceSkyBrowser::~ScreenSpaceSkyBrowser() { diff --git a/modules/skybrowser/src/targetbrowserpair.cpp b/modules/skybrowser/src/targetbrowserpair.cpp index 076018e708..d211c5f26f 100644 --- a/modules/skybrowser/src/targetbrowserpair.cpp +++ b/modules/skybrowser/src/targetbrowserpair.cpp @@ -45,7 +45,7 @@ TargetBrowserPair::TargetBrowserPair(SceneGraphNode* targetNode, : _targetNode(targetNode), _browser(browser) { ghoul_assert(browser != nullptr, "Sky browser is null pointer!"); - ghoul_assert(target != nullptr, "Sky target is null pointer!"); + ghoul_assert(targetNode != nullptr, "Sky target is null pointer!"); _targetRenderable = dynamic_cast(_targetNode->renderable()); }