mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-05 03:00:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add random colored borders to browsers and targets that are sufficiently bright, and add function to pass them to GUI

Browse Source
This commit is contained in:
Ylva Selling
2021-05-04 09:14:35 +02:00
parent 70642b0a55
commit 2eecb08bcf
7 changed files with 82 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
modules/skybrowser/skybrowsermodule_lua.inl
View File

@@ -178,29 +178,41 @@ namespace openspace::skybrowser::luascriptfunctions {
// Send image list to GUI
ghoul::lua::checkArgumentsAndThrow(L, 0, "lua::getTargetData");
ScreenSpaceSkyBrowser* browser = dynamic_cast<ScreenSpaceSkyBrowser*>(global::renderEngine->screenSpaceRenderable("SkyBrowser1"));
ScreenSpaceSkyTarget* target = dynamic_cast<ScreenSpaceSkyTarget*>(global::renderEngine->screenSpaceRenderable("SkyTarget1"));
SkyBrowserModule* module = global::moduleEngine->module<SkyBrowserModule>();
float FOV = browser->fieldOfView();
glm::dvec3 coords = target->getTargetDirection();
glm::dvec2 celestCoords = skybrowser::galacticCartesianToJ2000(coords);
lua_newtable(L);
int index = 1;
// Pass data for all the browsers and the corresponding targets
std::vector<ScreenSpaceSkyBrowser*> browsers = module->getSkyBrowsers();
// Index for many browsers
// For now it's only one
ghoul::lua::push(L, 1);
lua_newtable(L);
// Push ("Key", value)
ghoul::lua::push(L, "FOV", FOV);
lua_settable(L, -3);
ghoul::lua::push(L, "RA", celestCoords.x);
lua_settable(L, -3);
ghoul::lua::push(L, "Dec", celestCoords.y);
lua_settable(L, -3);
// Set table for the current ImageData
lua_settable(L, -3);
for (int i = 0; i < browsers.size(); i++) {
// Only add browsers that have an initialized target
ScreenSpaceSkyTarget* target = browsers[i]->getSkyTarget();
if (target) {
glm::dvec3 coords = target->getTargetDirection();
glm::dvec2 celestCoords = skybrowser::galacticCartesianToJ2000(coords);
// Convert color to vector so ghoul can read it
glm::ivec3 color = browsers[i]->_borderColor.value();
std::vector<int> colorVec = { color.r, color.g, color.b };
ghoul::lua::push(L, index);
index++;
lua_newtable(L);
// Push ("Key", value)
ghoul::lua::push(L, "FOV", browsers[i]->fieldOfView());
lua_settable(L, -3);
ghoul::lua::push(L, "RA", celestCoords.x);
lua_settable(L, -3);
ghoul::lua::push(L, "Dec", celestCoords.y);
lua_settable(L, -3);
ghoul::lua::push(L, "Color", colorVec);
lua_settable(L, -3);
// Set table for the current ImageData
lua_settable(L, -3);
}
}
return 1;
}