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

Change browser and targets starting position. Make browser larger than target by default

Browse Source
This commit is contained in:
Ylva Selling
2022-03-30 14:48:36 -04:00
parent 0f81a738db
commit 4063a49297
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/skybrowser/include/screenspaceskybrowser.h
View File

@@ -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

6
modules/skybrowser/skybrowsermodule_lua.inl
View File

@@ -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);

1
modules/skybrowser/src/screenspaceskybrowser.cpp
View File

@@ -137,6 +137,7 @@ namespace openspace {
SkyBrowserModule* module = global::moduleEngine->module<SkyBrowserModule>();
_borderColor = randomBorderColor(module->highlight());
}
_scale = _size.y * 0.5;
}
ScreenSpaceSkyBrowser::~ScreenSpaceSkyBrowser() {

2
modules/skybrowser/src/targetbrowserpair.cpp
View File

@@ -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<RenderableSkyTarget*>(_targetNode->renderable());
}