mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-30 15:59:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup, make hover circle add itself via lua function to the module. Make functions consistent how they interact with WWT

Browse Source
This commit is contained in:
sylvass
2021-12-01 13:48:12 -05:00
parent 69eb10cdda
commit 1fe86fe843
6 changed files with 86 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/skybrowser/skybrowsermodule_lua.inl
+38 -6
View File
@@ -23,15 +23,47 @@ int selectImage(lua_State* L) {
SkyBrowserModule* module = global::moduleEngine->module<SkyBrowserModule>();
if (module->isCameraInSolarSystem()) {
module->selectImage2dBrowser(i);
Pair* selected = module->getPair(module->selectedBrowserId());
if (selected) {
const ImageData& image = module->getWwtDataHandler()->getImage(i);
// Load image into browser
LINFO("Loading image " + image.name);
selected->selectImage(image, i);
bool isInView = skybrowser::isCoordinateInView(image.equatorialCartesian);
// If the coordinate is not in view, rotate camera
if (image.hasCelestialCoords && !isInView) {
module->startRotatingCamera(
skybrowser::equatorialToGalactic(image.equatorialCartesian)
);
}
}
}
else {
module->selectImage3dBrowser(i);
else if (module->get3dBrowser()) {
RenderableSkyBrowser* renderable = dynamic_cast<RenderableSkyBrowser*>(
module->get3dBrowser());
if (renderable) {
const ImageData& image = module->getWwtDataHandler()->getImage(i);
renderable->displayImage(image.imageUrl, i);
}
}
return 0;
}
int setHoverCircle(lua_State* L) {
ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::setHoverCircle");
SkyBrowserModule* module = global::moduleEngine->module<SkyBrowserModule>();
std::string id = ghoul::lua::value<std::string>(L, 1);
ScreenSpaceImageLocal* circle = dynamic_cast<ScreenSpaceImageLocal*>(
global::renderEngine->screenSpaceRenderable(id));
module->setHoverCircle(circle);
return 0;
}
int moveCircleToHoverImage(lua_State* L) {
// Load image
ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::moveCircleToHoverImage");
@@ -213,7 +245,7 @@ int getListOfImages(lua_State* L) {
lua_newtable(L);
for (int i = 0; i < module->nLoadedImages(); i++) {
const ImageData& img = module->getWWTDataHandler()->getImage(i);
const ImageData& img = module->getWwtDataHandler()->getImage(i);
glm::dvec3 coords = img.equatorialCartesian;
glm::dvec3 position = img.position3d;
@@ -477,7 +509,7 @@ int place3dSkyBrowser(lua_State* L) {
// Image index to place in 3D
const int i = ghoul::lua::value<int>(L, 1);
SkyBrowserModule* module = global::moduleEngine->module<SkyBrowserModule>();
const ImageData image = module->getWWTDataHandler()->getImage(i);
const ImageData image = module->getWwtDataHandler()->getImage(i);
module->place3dBrowser(image, i);
@@ -491,7 +523,7 @@ int removeSelectedImageInBrowser(lua_State* L) {
const std::string id = ghoul::lua::value<std::string>(L, 1);
// Get browser
SkyBrowserModule* module = global::moduleEngine->module<SkyBrowserModule>();
const ImageData& image = module->getWWTDataHandler()->getImage(i);
const ImageData& image = module->getWwtDataHandler()->getImage(i);
Pair* pair = module->getPair(id);
if (pair) {