From 6d0efc99df5aabb648c239f21bd86fca342bcb7b Mon Sep 17 00:00:00 2001 From: Ylva Selling Date: Thu, 3 Jun 2021 10:46:55 +0200 Subject: [PATCH] Disable hover circle outside of solar system --- modules/skybrowser/skybrowsermodule_lua.inl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/skybrowser/skybrowsermodule_lua.inl b/modules/skybrowser/skybrowsermodule_lua.inl index 3d491c381e..0cacc92280 100644 --- a/modules/skybrowser/skybrowsermodule_lua.inl +++ b/modules/skybrowser/skybrowsermodule_lua.inl @@ -95,7 +95,7 @@ namespace openspace::skybrowser::luascriptfunctions { const ImageData& resultImage = module->getWWTDataHandler()->getLoadedImages()[i]; // Only move and show circle if the image has coordinates - if (resultImage.hasCelestCoords) { + if (resultImage.hasCelestCoords && module->cameraInSolarSystem()) { // Make circle visible ScreenSpaceImageLocal* hoverCircle = dynamic_cast(global::renderEngine->screenSpaceRenderable("HoverCircle")); hoverCircle->property("Enabled")->set(true); @@ -110,7 +110,9 @@ namespace openspace::skybrowser::luascriptfunctions { int disableHoverCircle(lua_State* L) { ghoul::lua::checkArgumentsAndThrow(L, 0, "lua::disableHoverCircle"); ScreenSpaceImageLocal* hoverCircle = dynamic_cast(global::renderEngine->screenSpaceRenderable("HoverCircle")); - hoverCircle->property("Enabled")->set(false); + if (hoverCircle->isEnabled()) { + hoverCircle->property("Enabled")->set(false); + } return 0; }