mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-04 10:40:09 -06:00
Restructure and clean up
This commit is contained in:
sylvass
@@ -22,28 +22,28 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#include <modules/skybrowser/skybrowsermodule.h>
|
||||
#include <modules/skybrowser/include/wwtdatahandler.h>
|
||||
//#include <modules/webbrowser/webbrowsermodule.h>
|
||||
//#include <modules/webbrowser/include/screenspacebrowser.h>
|
||||
|
||||
#include <openspace/rendering/screenspacerenderable.h>
|
||||
#include <openspace/rendering/renderengine.h>
|
||||
#include <openspace/rendering/renderable.h>
|
||||
#include <openspace/engine/moduleengine.h>
|
||||
#include <openspace/engine/globals.h>
|
||||
#include <openspace/engine/globalscallbacks.h>
|
||||
#include <openspace/engine/windowdelegate.h>
|
||||
#include <openspace/engine/windowdelegate.h>
|
||||
#include <openspace/rendering/renderengine.h>
|
||||
#include <openspace/scripting/scriptengine.h>
|
||||
#include <openspace/scene/scenegraphnode.h>
|
||||
#include <openspace/interaction/navigationhandler.h>
|
||||
#include <openspace/scene/scene.h>
|
||||
|
||||
#include <openspace/interaction/navigationhandler.h>
|
||||
#include <openspace/util/distanceconstants.h>
|
||||
#include <openspace/util/factorymanager.h>
|
||||
#include <modules/skybrowser/include/wwtdatahandler.h>
|
||||
#include <modules/skybrowser/skybrowsermodule.h>
|
||||
#include "skybrowsermodule_lua.inl"
|
||||
#include <glm/gtx/vector_angle.hpp>
|
||||
#include <glm/gtx/string_cast.hpp> // For printing glm data
|
||||
#include <ghoul/logging/logmanager.h>
|
||||
#include <ghoul/opengl/texture.h>
|
||||
#include <cmath> // For atan2
|
||||
#include <glm/gtx/string_cast.hpp> // For printing glm data
|
||||
#include <algorithm>
|
||||
#include <fstream>
|
||||
|
||||
@@ -211,8 +211,8 @@ namespace openspace {
|
||||
"input. An input string should be the name of the system host star"
|
||||
},
|
||||
{
|
||||
"addToSkyBrowserModule",
|
||||
&skybrowser::luascriptfunctions::addToSkyBrowserModule,
|
||||
"add3dBrowserToSkyBrowserModule",
|
||||
&skybrowser::luascriptfunctions::add3dBrowserToSkyBrowserModule,
|
||||
{},
|
||||
"string or list of strings",
|
||||
"Add one or multiple exoplanet systems to the scene, as specified by the "
|
||||
@@ -241,177 +241,65 @@ namespace openspace {
|
||||
"string or list of strings",
|
||||
"Add one or multiple exoplanet systems to the scene, as specified by the "
|
||||
"input. An input string should be the name of the system host star"
|
||||
},
|
||||
{
|
||||
"addPairToSkyBrowserModule",
|
||||
&skybrowser::luascriptfunctions::addPairToSkyBrowserModule,
|
||||
{},
|
||||
"string or list of strings",
|
||||
"Add one or multiple exoplanet systems to the scene, as specified by the "
|
||||
"input. An input string should be the name of the system host star"
|
||||
},
|
||||
};
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
// Transforms a pixel coordinate to a screen space coordinate
|
||||
glm::vec2 pixelToScreenSpace(glm::vec2& mouseCoordinate) {
|
||||
glm::vec2 size = global::windowDelegate->currentWindowSize();
|
||||
// Change origin to middle of the window
|
||||
glm::vec2 screenSpacePos = glm::vec2((mouseCoordinate - (size / 2.0f)));
|
||||
// Ensure the upper right corner is positive on the y axis
|
||||
screenSpacePos *= glm::vec2(1.0f, -1.0f);
|
||||
// Transform pixel coordinates to screen space coordinates [-1,1][-ratio, ratio]
|
||||
screenSpacePos /= (0.5f * size.y);
|
||||
return screenSpacePos;
|
||||
}
|
||||
|
||||
|
||||
SkyBrowserModule::SkyBrowserModule()
|
||||
: OpenSpaceModule(SkyBrowserModule::Name)
|
||||
{
|
||||
global::callback::mousePosition->emplace_back(
|
||||
[&](double x, double y) {
|
||||
|
||||
glm::vec2 pixel = glm::vec2(static_cast<float>(x), static_cast<float>(y));
|
||||
_mousePosition = pixelToScreenSpace(pixel);
|
||||
|
||||
if (_isDragging) {
|
||||
|
||||
glm::dvec2 move = _mousePosition - _startMousePosition;
|
||||
|
||||
// Change view within the browser and move target accordingly to mouse drag movement
|
||||
if (_fineTuneMode) {
|
||||
// WWT FOV
|
||||
double WWTVerticalFOV = toBrowser(_mouseOnObject)->verticalFov();
|
||||
glm::dvec2 browserDim = toBrowser(_mouseOnObject)->screenSpaceDimensions();
|
||||
double browserRatio = browserDim.x / browserDim.y;
|
||||
glm::dvec2 WWTFOV = glm::dvec2(WWTVerticalFOV * browserRatio, WWTVerticalFOV);
|
||||
|
||||
// OpenSpace FOV
|
||||
glm::dvec2 windowDim = global::windowDelegate->currentWindowSize();
|
||||
double windowRatio = windowDim.y / windowDim.x;
|
||||
double OpenSpaceHorizontalFOV = global::windowDelegate->getHorizFieldOfView();
|
||||
glm::dvec2 OpenSpaceFOV = glm::dvec2(OpenSpaceHorizontalFOV, OpenSpaceHorizontalFOV * windowRatio);
|
||||
|
||||
glm::dvec2 angleResult = WWTFOV * (move / browserDim);
|
||||
glm::dvec2 OSresult = angleResult / OpenSpaceFOV;
|
||||
|
||||
// Calculate translation in ScreenSpaceCoordinates
|
||||
glm::dvec2 screenSpaceCoord{ (2 / windowRatio), 2.f };
|
||||
glm::dvec2 result = screenSpaceCoord * OSresult;
|
||||
|
||||
toBrowser(_mouseOnObject)->getSkyTarget()->translate(-result, _startDragPosition);
|
||||
|
||||
}
|
||||
// Move browser or target
|
||||
else _mouseOnObject->translate(move, _startDragPosition);
|
||||
|
||||
}
|
||||
else if (_isResizing) {
|
||||
// Calculate scaling factor
|
||||
glm::vec2 mouseDragVector = (_mousePosition - _startMousePosition);
|
||||
glm::vec2 scalingVector = mouseDragVector * _resizeDirection;
|
||||
glm::vec2 newSizeRelToOld = (_startBrowserSize + (scalingVector)) / _startBrowserSize;
|
||||
// Scale the browser
|
||||
toBrowser(_mouseOnObject)->setScale(newSizeRelToOld);
|
||||
|
||||
// For dragging functionality, translate so it looks like the browser isn't moving
|
||||
// Make sure the browser doesn't move in directions it's not supposed to
|
||||
_mouseOnObject->translate(mouseDragVector * abs(_resizeDirection) / 2.f, _startDragPosition);
|
||||
}
|
||||
// If there is no dragging or resizing, look for new objects
|
||||
else {
|
||||
// Save old selection for removing highlight
|
||||
ScreenSpaceRenderable* lastObj = _mouseOnObject;
|
||||
|
||||
// Find and save what mouse is currently hovering on
|
||||
auto currentlyOnObject = std::find_if(_renderables.begin(), _renderables.end(), [&](ScreenSpaceRenderable* obj) {
|
||||
return obj && (obj->coordIsInsideCornersScreenSpace(_mousePosition) && obj->isEnabled());
|
||||
});
|
||||
_mouseOnObject = currentlyOnObject != _renderables.end() ? *currentlyOnObject : nullptr;
|
||||
|
||||
// Selection has changed
|
||||
if (lastObj != _mouseOnObject) {
|
||||
// Remove highlight
|
||||
if (toBrowser(lastObj)) {
|
||||
toBrowser(lastObj)->setWebpageBorderColor(toBrowser(lastObj)->borderColor() - _highlightAddition);
|
||||
}
|
||||
else if (toTarget(lastObj)) {
|
||||
toTarget(lastObj)->setColor(toTarget(lastObj)->borderColor() - _highlightAddition);
|
||||
}
|
||||
|
||||
// Add highlight
|
||||
if (toBrowser(_mouseOnObject)) {
|
||||
toBrowser(_mouseOnObject)->setWebpageBorderColor(toBrowser(_mouseOnObject)->borderColor() + _highlightAddition);
|
||||
}
|
||||
else if (toTarget(_mouseOnObject)) {
|
||||
toTarget(_mouseOnObject)->setColor(toTarget(_mouseOnObject)->borderColor() + _highlightAddition);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
global::callback::mouseScrollWheel->emplace_back(
|
||||
[&](double, double scroll) -> bool {
|
||||
|
||||
// If mouse is on browser or target, apply zoom
|
||||
if (toBrowser(_mouseOnObject)) {
|
||||
toBrowser(_mouseOnObject)->setVerticalFovWithScroll(static_cast<float>(scroll));
|
||||
return true;
|
||||
}
|
||||
else if (toTarget(_mouseOnObject) && toTarget(_mouseOnObject)->getSkyBrowser()) {
|
||||
toTarget(_mouseOnObject)->getSkyBrowser()->setVerticalFovWithScroll(static_cast<float>(scroll));
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
);
|
||||
|
||||
global::callback::mouseButton->emplace_back(
|
||||
[&](MouseButton button, MouseAction action, KeyModifier modifier) -> bool {
|
||||
|
||||
if (_mouseOnObject && action == MouseAction::Press) {
|
||||
if (_mouseOnPair && action == MouseAction::Press) {
|
||||
|
||||
// Get the currently selected browser
|
||||
if (toBrowser(_mouseOnObject)) {
|
||||
setSelectedBrowser(toBrowser(_mouseOnObject));
|
||||
}
|
||||
else if (toTarget(_mouseOnObject) &&
|
||||
toTarget(_mouseOnObject)->getSkyBrowser()) {
|
||||
|
||||
setSelectedBrowser(toTarget(_mouseOnObject)->getSkyBrowser());
|
||||
}
|
||||
setSelectedBrowser(_mouseOnPair->getBrowser());
|
||||
|
||||
if (button == MouseButton::Left) {
|
||||
_isRotating = false;
|
||||
_cameraIsRotating = false;
|
||||
_startMousePosition = _mousePosition;
|
||||
_startDragPosition = _mouseOnObject->screenSpacePosition();
|
||||
_startDragPosition = _isBrowser ? _mouseOnPair->getBrowser()->screenSpacePosition()
|
||||
: _mouseOnPair->getTarget()->screenSpacePosition();
|
||||
|
||||
// If current object is browser, check for resizing
|
||||
if (toBrowser(_mouseOnObject)) {
|
||||
if (_isBrowser) {
|
||||
// Resize browser if mouse is over resize button
|
||||
_resizeDirection = toBrowser(_mouseOnObject)->isOnResizeArea(_mousePosition);
|
||||
_resizeDirection = _mouseOnPair->getBrowser()->isOnResizeArea(_mousePosition);
|
||||
if (_resizeDirection != glm::vec2{ 0 }) {
|
||||
toBrowser(_mouseOnObject)->saveResizeStartSize();
|
||||
_startBrowserSize = toBrowser(_mouseOnObject)->screenSpaceDimensions();
|
||||
_mouseOnPair->getBrowser()->saveResizeStartSize();
|
||||
_startBrowserSize = _mouseOnPair->getBrowser()->screenSpaceDimensions();
|
||||
_isResizing = true;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
// If you start dragging around the target, it should unlock
|
||||
if (toTarget(_mouseOnObject)) {
|
||||
toTarget(_mouseOnObject)->unlock();
|
||||
else {
|
||||
_mouseOnPair->getTarget()->unlock();
|
||||
}
|
||||
_isDragging = true;
|
||||
|
||||
return true;
|
||||
}
|
||||
else if (toBrowser(_mouseOnObject) && button == MouseButton::Right) {
|
||||
}
|
||||
else if (_isBrowser && button == MouseButton::Right) {
|
||||
// If you start dragging around on the browser, the target should unlock
|
||||
if (toBrowser(_mouseOnObject) && toBrowser(_mouseOnObject)->getSkyTarget()) {
|
||||
toBrowser(_mouseOnObject)->getSkyTarget()->unlock();
|
||||
}
|
||||
_mouseOnPair->getTarget()->unlock();
|
||||
// Change view (by moving target) within browser if right mouse click on browser
|
||||
_startMousePosition = _mousePosition;
|
||||
_startDragPosition = toBrowser(_mouseOnObject)->getSkyTarget()->screenSpacePosition();
|
||||
_startDragPosition = _mouseOnPair->getTarget()->screenSpacePosition();
|
||||
_fineTuneMode = true;
|
||||
_isDragging = true;
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -419,12 +307,16 @@ SkyBrowserModule::SkyBrowserModule()
|
||||
else if (action == MouseAction::Release) {
|
||||
if (_isDragging) {
|
||||
_isDragging = false;
|
||||
|
||||
return true;
|
||||
}
|
||||
if (_fineTuneMode) {
|
||||
_fineTuneMode = false;
|
||||
return true;
|
||||
}
|
||||
if (_isResizing) {
|
||||
_isResizing = false;
|
||||
toBrowser(_mouseOnObject)->updateBrowserSize();
|
||||
_mouseOnPair->getBrowser()->updateBrowserSize();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -433,24 +325,80 @@ SkyBrowserModule::SkyBrowserModule()
|
||||
}
|
||||
);
|
||||
|
||||
global::callback::mousePosition->emplace_back(
|
||||
[&](double x, double y) {
|
||||
|
||||
if (_cameraInSolarSystem) {
|
||||
glm::vec2 pixel{ static_cast<float>(x), static_cast<float>(y) };
|
||||
_mousePosition = skybrowser::pixelToScreenSpace(pixel);
|
||||
glm::vec2 translation = _mousePosition - _startMousePosition;
|
||||
|
||||
if (_isDragging || _isResizing) {
|
||||
if (_isResizing) {
|
||||
// Calculate scaling factor
|
||||
glm::vec2 mouseDragVector = (_mousePosition - _startMousePosition);
|
||||
glm::vec2 scalingVector = mouseDragVector * _resizeDirection;
|
||||
glm::vec2 newSizeRelToOld = (_startBrowserSize + (scalingVector)) / _startBrowserSize;
|
||||
// Scale the browser
|
||||
_mouseOnPair->getBrowser()->setScale(newSizeRelToOld);
|
||||
|
||||
// For dragging functionality, translate so it looks like the browser
|
||||
// isn't moving. Make sure the browser doesn't move in directions it's
|
||||
// not supposed to
|
||||
translation = mouseDragVector * abs(_resizeDirection) / 2.f;
|
||||
|
||||
}
|
||||
// Translate
|
||||
if (_isBrowser) {
|
||||
_mouseOnPair->getBrowser()->translate(translation, _startDragPosition);
|
||||
}
|
||||
else {
|
||||
_mouseOnPair->getTarget()->translate(translation, _startDragPosition);
|
||||
}
|
||||
}
|
||||
else if (_fineTuneMode) {
|
||||
glm::vec2 fineTune = _mouseOnPair->getBrowser()->fineTuneTarget(translation);
|
||||
_mouseOnPair->getTarget()->translate(fineTune, _startDragPosition);
|
||||
}
|
||||
// If there is no dragging or resizing, look for new objects
|
||||
else {
|
||||
setSelectedObject();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
);
|
||||
|
||||
global::callback::mouseScrollWheel->emplace_back(
|
||||
[&](double, double scroll) -> bool {
|
||||
|
||||
// If mouse is on browser or target, apply zoom
|
||||
if (_mouseOnPair) {
|
||||
_mouseOnPair->getBrowser()->setVerticalFovWithScroll(static_cast<float>(scroll));
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
global::callback::preSync->emplace_back([this]() {
|
||||
// Disable browser and targets when camera is outside of solar system
|
||||
double solarSystemRadius = 30.0 * distanceconstants::AstronomicalUnit;
|
||||
double cameraSSBDistance = glm::length(
|
||||
global::navigationHandler->camera()->positionVec3());
|
||||
_cameraInSolarSystem = cameraSSBDistance < solarSystemRadius;
|
||||
double fadingTime = 2.0;
|
||||
_cameraInSolarSystem = cameraSSBDistance < _solarSystemRadius;
|
||||
double deltaTime = global::windowDelegate->deltaTime();
|
||||
|
||||
// Fade out or in browser & target
|
||||
for (std::pair<std::string, ScreenSpaceSkyBrowser*> pair : _browsers) {
|
||||
ScreenSpaceSkyBrowser* browser = pair.second;
|
||||
for (SkyBrowserModule::Pair pair : _targetsBrowsers) {
|
||||
ScreenSpaceSkyBrowser* browser = pair.getBrowser();
|
||||
// If outside solar system and browser is visible
|
||||
if (!_cameraInSolarSystem && browser->isEnabled()) {
|
||||
bool fadingIsFinished = fadeBrowserAndTarget(true, fadingTime, deltaTime);
|
||||
bool fadingIsFinished = fadeBrowserAndTarget(true, _fadingTime, deltaTime);
|
||||
|
||||
if (fadingIsFinished) {
|
||||
browser->property("Enabled")->set(false);
|
||||
pair.getBrowser()->property("Enabled")->set(false);
|
||||
// Select the 3D browser when moving out of the solar system
|
||||
if (_browser3d != nullptr) {
|
||||
_selectedBrowser = _browser3d->renderable()->identifier();
|
||||
@@ -459,25 +407,26 @@ SkyBrowserModule::SkyBrowserModule()
|
||||
}
|
||||
// If within solar system and browser is not visible
|
||||
else if (_cameraInSolarSystem && !browser->isEnabled()) {
|
||||
browser->property("Enabled")->set(true);
|
||||
pair.getBrowser()->property("Enabled")->set(true);
|
||||
// Select the first 2D browser when moving into the solar system
|
||||
if (_browsers.size() != 0) {
|
||||
_selectedBrowser = std::begin(_browsers)->second->identifier();
|
||||
if (_targetsBrowsers.size() != 0) {
|
||||
_selectedBrowser = std::begin(_targetsBrowsers)->getBrowser()->identifier();
|
||||
}
|
||||
}
|
||||
// If within solar system and browser is visible
|
||||
if (_cameraInSolarSystem && browser->isEnabled()) {
|
||||
fadeBrowserAndTarget(false, fadingTime, deltaTime);
|
||||
fadeBrowserAndTarget(false, _fadingTime, deltaTime);
|
||||
|
||||
if (browser->getSkyTarget()) {
|
||||
browser->getSkyTarget()->animateToCoordinate(deltaTime);
|
||||
}
|
||||
pair.getTarget()->animateToCoordinate(deltaTime);
|
||||
}
|
||||
}
|
||||
if (_isRotating) {
|
||||
if (_cameraIsRotating) {
|
||||
rotateCamera(deltaTime);
|
||||
}
|
||||
});
|
||||
|
||||
_hoverCircle = dynamic_cast<ScreenSpaceImageLocal*>(
|
||||
global::renderEngine->screenSpaceRenderable("HoverCircle"));
|
||||
}
|
||||
|
||||
SkyBrowserModule::~SkyBrowserModule() {
|
||||
@@ -508,30 +457,58 @@ void SkyBrowserModule::internalInitialize(const ghoul::Dictionary& dict) {
|
||||
_dataHandler = new WwtDataHandler();
|
||||
}
|
||||
|
||||
int SkyBrowserModule::getAndIncrementMessageOrder() {
|
||||
return _messageOrder++;
|
||||
}
|
||||
void SkyBrowserModule::setSelectedObject()
|
||||
{
|
||||
// Save old selection for removing highlight
|
||||
Pair* lastObj = _mouseOnPair;
|
||||
|
||||
void SkyBrowserModule::addRenderable(ScreenSpaceRenderable* object) {
|
||||
_renderables.push_back(object);
|
||||
// Sort on z coordinate, objects closer to camera are in beginning of list
|
||||
std::sort(_renderables.begin(), _renderables.end());
|
||||
ScreenSpaceSkyBrowser* browser = toBrowser(object);
|
||||
if (browser) {
|
||||
_browsers[browser->identifier()] = browser;
|
||||
// Find and save what mouse is currently hovering on
|
||||
auto it = std::find_if(std::begin(_targetsBrowsers), std::end(_targetsBrowsers),[&](Pair &pair) {
|
||||
bool onBrowser = pair.getBrowser()->coordIsInsideCornersScreenSpace(_mousePosition);
|
||||
bool onTarget = pair.getTarget()->coordIsInsideCornersScreenSpace(_mousePosition);
|
||||
if (onBrowser || onTarget) {
|
||||
_mouseOnPair = &pair;
|
||||
_isBrowser = onBrowser;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
});
|
||||
|
||||
if (it == std::end(_targetsBrowsers)) {
|
||||
_mouseOnPair = nullptr;
|
||||
}
|
||||
|
||||
|
||||
// Selection has changed
|
||||
if (lastObj != _mouseOnPair) {
|
||||
|
||||
// Remove highlight
|
||||
if (lastObj) {
|
||||
lastObj->getBrowser()->removeHighlight(_highlightAddition);
|
||||
lastObj->getTarget()->removeHighlight(_highlightAddition);
|
||||
}
|
||||
// Add highlight to new selection
|
||||
if (_mouseOnPair) {
|
||||
_mouseOnPair->getBrowser()->highlight(_highlightAddition);
|
||||
_mouseOnPair->getTarget()->highlight(_highlightAddition);
|
||||
std::string id = _mouseOnPair->getBrowser()->identifier();
|
||||
std::string info = "Currently selected browser is " + id;
|
||||
LINFO(info + id);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
bool SkyBrowserModule::browserIdExists(std::string id) {
|
||||
// If the id doesn't exist, return false
|
||||
if (_browsers.find(id) == _browsers.end()) {
|
||||
return false;
|
||||
void SkyBrowserModule::addTargetBrowserPair(ScreenSpaceSkyTarget* newTarget, ScreenSpaceSkyBrowser* newBrowser) {
|
||||
// Assert pair to have both target and browser
|
||||
if (newBrowser && newTarget) {
|
||||
Pair newPair(newBrowser, newTarget);
|
||||
_targetsBrowsers.push_back(newPair);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void SkyBrowserModule::createTargetBrowserPair() {
|
||||
int noOfPairs = static_cast<int>(getSkyBrowsers().size()) + 1;
|
||||
int noOfPairs = static_cast<int>(_targetsBrowsers.size()) + 1;
|
||||
std::string nameBrowser = "Sky Browser " + std::to_string(noOfPairs);
|
||||
std::string nameTarget = "Sky Target " + std::to_string(noOfPairs);
|
||||
std::string idBrowser = "SkyBrowser" + std::to_string(noOfPairs);
|
||||
@@ -547,7 +524,7 @@ void SkyBrowserModule::createTargetBrowserPair() {
|
||||
"Name = '" + nameBrowser + "',"
|
||||
"Url = '"+ url +"',"
|
||||
"FaceCamera = false,"
|
||||
"TargetID = '" + idTarget + "',"
|
||||
"TargetId = '" + idTarget + "',"
|
||||
"CartesianPosition = " + ghoul::to_string(positionBrowser) + ","
|
||||
"}";
|
||||
const std::string target = "{"
|
||||
@@ -555,7 +532,7 @@ void SkyBrowserModule::createTargetBrowserPair() {
|
||||
"Type = 'ScreenSpaceSkyTarget',"
|
||||
"Name = '" + nameTarget + "',"
|
||||
"FaceCamera = false,"
|
||||
"BrowserID = '" + idBrowser + "',"
|
||||
"BrowserId = '" + idBrowser + "',"
|
||||
"}";
|
||||
|
||||
openspace::global::scriptEngine->queueScript(
|
||||
@@ -568,16 +545,6 @@ void SkyBrowserModule::createTargetBrowserPair() {
|
||||
scripting::ScriptEngine::RemoteScripting::Yes
|
||||
);
|
||||
|
||||
openspace::global::scriptEngine->queueScript(
|
||||
"openspace.skybrowser.addToSkyBrowserModule('" + idTarget + "');",
|
||||
scripting::ScriptEngine::RemoteScripting::Yes
|
||||
);
|
||||
|
||||
openspace::global::scriptEngine->queueScript(
|
||||
"openspace.skybrowser.addToSkyBrowserModule('" + idBrowser + "');",
|
||||
scripting::ScriptEngine::RemoteScripting::Yes
|
||||
);
|
||||
|
||||
openspace::global::scriptEngine->queueScript(
|
||||
"openspace.skybrowser.connectBrowserTarget('" + idBrowser + "');",
|
||||
scripting::ScriptEngine::RemoteScripting::Yes
|
||||
@@ -588,125 +555,133 @@ void SkyBrowserModule::createTargetBrowserPair() {
|
||||
scripting::ScriptEngine::RemoteScripting::Yes
|
||||
);
|
||||
|
||||
openspace::global::scriptEngine->queueScript(
|
||||
"openspace.skybrowser.addPairToSkyBrowserModule('" + idTarget + "','" + idBrowser + "');",
|
||||
scripting::ScriptEngine::RemoteScripting::Yes
|
||||
);
|
||||
|
||||
openspace::global::scriptEngine->queueScript(
|
||||
"openspace.skybrowser.setSelectedBrowser('" + idBrowser + "');",
|
||||
scripting::ScriptEngine::RemoteScripting::Yes
|
||||
);
|
||||
}
|
||||
|
||||
void SkyBrowserModule::removeTargetBrowserPair(std::string& browserId) {
|
||||
if (!browserIdExists(browserId)) return;
|
||||
void SkyBrowserModule::removeTargetBrowserPair(std::string& id) {
|
||||
|
||||
ScreenSpaceSkyBrowser* browser = _browsers[browserId];
|
||||
|
||||
// Find corresponding target
|
||||
std::string targetId{ "" };
|
||||
bool hasTarget = browser->getSkyTarget();
|
||||
if (hasTarget) {
|
||||
targetId = browser->getSkyTarget()->identifier();
|
||||
Pair* found = getPair(id);
|
||||
if (!found) {
|
||||
return;
|
||||
}
|
||||
// Remove pointer to the renderable from browsers vector
|
||||
_browsers.erase(browserId);
|
||||
auto it = std::remove(std::begin(_targetsBrowsers), std::end(_targetsBrowsers),
|
||||
*found);
|
||||
|
||||
// Remove pointer to the renderable from screenspace renderable vector
|
||||
_renderables.erase(std::remove_if(std::begin(_renderables), std::end(_renderables),
|
||||
[&](ScreenSpaceRenderable* renderable) {
|
||||
if (renderable->identifier() == browserId) {
|
||||
return true;
|
||||
}
|
||||
else if (renderable->identifier() == targetId) {
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
return false;
|
||||
}
|
||||
}), std::end(_renderables));
|
||||
std::string browserId = found->getBrowser()->identifier();
|
||||
std::string targetId = found->getTarget()->identifier();
|
||||
// Remove from engine
|
||||
openspace::global::scriptEngine->queueScript(
|
||||
"openspace.removeScreenSpaceRenderable('" + browserId + "');",
|
||||
scripting::ScriptEngine::RemoteScripting::Yes
|
||||
);
|
||||
|
||||
if (hasTarget) {
|
||||
openspace::global::scriptEngine->queueScript(
|
||||
"openspace.removeScreenSpaceRenderable('" + targetId + "');",
|
||||
scripting::ScriptEngine::RemoteScripting::Yes
|
||||
);
|
||||
}
|
||||
openspace::global::scriptEngine->queueScript(
|
||||
"openspace.removeScreenSpaceRenderable('" + targetId + "');",
|
||||
scripting::ScriptEngine::RemoteScripting::Yes
|
||||
);
|
||||
|
||||
_mouseOnObject = nullptr;
|
||||
_targetsBrowsers.erase(it, std::end(_targetsBrowsers));
|
||||
_mouseOnPair = nullptr;
|
||||
}
|
||||
|
||||
void SkyBrowserModule::place3dBrowser(ImageData& image) {
|
||||
if (_browser3d) {
|
||||
std::string id = _browser3d->identifier();
|
||||
std::string renderableId = _browser3d->renderable()->identifier();
|
||||
// Uris for properties
|
||||
std::string sizeUri = "Scene." + id + "." + renderableId + ".Size";
|
||||
std::string positionUri = "Scene." + id + ".Translation.Position";
|
||||
std::string rotationUri = "Scene." + id + ".Rotation.Rotation";
|
||||
std::string cameraAim = "NavigationHandler.OrbitalNavigator.Aim";
|
||||
glm::dvec3 position = image.position3d * distanceconstants::Parsec;
|
||||
// Calculate the size of the plane with trigonometry
|
||||
// Calculate in equatorial coordinate system since the FOV is from Earth
|
||||
// /|
|
||||
// /_| Adjacent is the horizontal line, opposite the vertical
|
||||
// \ | Calculate for half the triangle first, then multiply with 2
|
||||
// \|
|
||||
glm::dvec3 j2000 = skybrowser::galacticToEquatorial(position);
|
||||
double adjacent = glm::length(j2000);
|
||||
double opposite = 2 * adjacent * glm::tan(glm::radians(image.fov * 0.5));
|
||||
|
||||
// Calculate rotation to make the plane face the solar system barycenter
|
||||
glm::dvec3 normal = glm::normalize(-position);
|
||||
glm::dvec3 newRight = glm::normalize(
|
||||
glm::cross(glm::dvec3(0.0, 0.0, 1.0), normal)
|
||||
);
|
||||
glm::dvec3 newUp = glm::cross(normal, newRight);
|
||||
// Face the Solar System Barycenter
|
||||
glm::dmat3 rotation = glm::dmat3(1.0);
|
||||
rotation[0] = newRight;
|
||||
rotation[1] = newUp;
|
||||
rotation[2] = normal;
|
||||
|
||||
openspace::global::scriptEngine->queueScript(
|
||||
"openspace.setPropertyValueSingle('" + sizeUri + "', " + std::to_string(opposite) + ");",
|
||||
scripting::ScriptEngine::RemoteScripting::Yes
|
||||
);
|
||||
openspace::global::scriptEngine->queueScript(
|
||||
"openspace.setPropertyValueSingle('" + positionUri + "', " + ghoul::to_string(position) + ");",
|
||||
scripting::ScriptEngine::RemoteScripting::Yes
|
||||
);
|
||||
openspace::global::scriptEngine->queueScript(
|
||||
"openspace.setPropertyValueSingle('" + rotationUri + "', " + ghoul::to_string(rotation) + ");",
|
||||
scripting::ScriptEngine::RemoteScripting::Yes
|
||||
);
|
||||
lookAt3dBrowser();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
void SkyBrowserModule::set3dBrowser(SceneGraphNode* node) {
|
||||
_browser3d = node;
|
||||
}
|
||||
|
||||
ScreenSpaceSkyBrowser* SkyBrowserModule::toBrowser(ScreenSpaceRenderable* ptr) {
|
||||
return dynamic_cast<ScreenSpaceSkyBrowser*>(ptr);
|
||||
}
|
||||
ScreenSpaceSkyTarget* SkyBrowserModule::toTarget(ScreenSpaceRenderable* ptr) {
|
||||
return dynamic_cast<ScreenSpaceSkyTarget*>(ptr);
|
||||
void SkyBrowserModule::selectImage2dBrowser(int i)
|
||||
{
|
||||
Pair* selected = getPair(_selectedBrowser);
|
||||
if (selected) {
|
||||
|
||||
const ImageData& image = _dataHandler->getImage(i);
|
||||
// Load image into browser
|
||||
LINFO("Loading image " + image.name);
|
||||
selected->getBrowser()->addSelectedImage(image, i);
|
||||
|
||||
// If the image has coordinates, move the target
|
||||
if (image.hasCelestialCoords) {
|
||||
|
||||
// Animate the target to the image coordinate position
|
||||
selected->getTarget()->unlock();
|
||||
selected->getTarget()->startAnimation(image.equatorialCartesian, image.fov);
|
||||
|
||||
// If the coordinate is not in view, rotate camera
|
||||
if (skybrowser::coordinateIsOutsideView(image.equatorialCartesian)) {
|
||||
glm::dvec3 galactic = skybrowser::equatorialToGalactic(image.equatorialCartesian);
|
||||
startRotation(galactic);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
WwtDataHandler* SkyBrowserModule::getWWTDataHandler() {
|
||||
|
||||
void SkyBrowserModule::selectImage3dBrowser(int i)
|
||||
{
|
||||
const ImageData& image = _dataHandler->getImage(i);
|
||||
if (_browser3d) {
|
||||
RenderableSkyBrowser* browser3d = dynamic_cast<RenderableSkyBrowser*>(
|
||||
_browser3d->renderable());
|
||||
if (browser3d) {
|
||||
browser3d->displayImage(image, i);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void SkyBrowserModule::moveHoverCircle(int i)
|
||||
{
|
||||
const ImageData& image = _dataHandler->getImage(i);
|
||||
|
||||
// Only move and show circle if the image has coordinates
|
||||
if (_hoverCircle && image.hasCelestialCoords && _cameraInSolarSystem) {
|
||||
// Make circle visible
|
||||
_hoverCircle->property("Enabled")->set(true);
|
||||
|
||||
// Calculate coords for the circle and translate
|
||||
glm::vec3 coordsScreen = skybrowser::equatorialToScreenSpace(
|
||||
image.equatorialCartesian
|
||||
);
|
||||
_hoverCircle->property("CartesianPosition")->set(coordsScreen);
|
||||
}
|
||||
}
|
||||
|
||||
void SkyBrowserModule::loadImages(const std::string& root, const std::string& directory,
|
||||
std::vector<std::filesystem::path>& speckFiles)
|
||||
{
|
||||
_dataHandler->loadImages(root, directory, speckFiles);
|
||||
}
|
||||
|
||||
int SkyBrowserModule::nLoadedImages()
|
||||
{
|
||||
return _dataHandler->nLoadedImages();
|
||||
}
|
||||
|
||||
const WwtDataHandler* SkyBrowserModule::getWWTDataHandler() {
|
||||
return _dataHandler;
|
||||
}
|
||||
|
||||
std::map<std::string, ScreenSpaceSkyBrowser*>& SkyBrowserModule::getSkyBrowsers() {
|
||||
return _browsers;
|
||||
std::vector<SkyBrowserModule::Pair>& SkyBrowserModule::getPairs()
|
||||
{
|
||||
return _targetsBrowsers;
|
||||
}
|
||||
|
||||
std::vector<ScreenSpaceRenderable*>& SkyBrowserModule::getBrowsersAndTargets() {
|
||||
return _renderables;
|
||||
SkyBrowserModule::Pair* SkyBrowserModule::getPair(std::string id)
|
||||
{
|
||||
auto it = std::find_if(std::begin(_targetsBrowsers), std::end(_targetsBrowsers),
|
||||
[&](Pair& pair) {
|
||||
bool foundBrowser = pair.getBrowser()->identifier() == id;
|
||||
bool foundTarget = pair.getTarget()->identifier() == id;
|
||||
return foundBrowser || foundTarget;
|
||||
});
|
||||
return &(*it);
|
||||
}
|
||||
|
||||
SceneGraphNode* SkyBrowserModule::get3dBrowser() {
|
||||
@@ -717,15 +692,18 @@ void SkyBrowserModule::lookAt3dBrowser() {
|
||||
std::string id = _browser3d->identifier();
|
||||
// Target camera on the 3D sky browser
|
||||
openspace::global::scriptEngine->queueScript(
|
||||
"openspace.setPropertyValueSingle(\"NavigationHandler.OrbitalNavigator.RetargetAnchor\", nil)",
|
||||
"openspace.setPropertyValueSingle(\"NavigationHandler.OrbitalNavigator."
|
||||
"RetargetAnchor\", nil)",
|
||||
scripting::ScriptEngine::RemoteScripting::Yes
|
||||
);
|
||||
openspace::global::scriptEngine->queueScript(
|
||||
"openspace.setPropertyValueSingle(\"NavigationHandler.OrbitalNavigator.Anchor\", '" + id + "')",
|
||||
"openspace.setPropertyValueSingle(\"NavigationHandler.OrbitalNavigator."
|
||||
"Anchor\", '" + id + "')",
|
||||
scripting::ScriptEngine::RemoteScripting::Yes
|
||||
);
|
||||
openspace::global::scriptEngine->queueScript(
|
||||
"openspace.setPropertyValueSingle(\"NavigationHandler.OrbitalNavigator.Aim\", '')",
|
||||
"openspace.setPropertyValueSingle(\"NavigationHandler.OrbitalNavigator."
|
||||
"Aim\", '')",
|
||||
scripting::ScriptEngine::RemoteScripting::Yes
|
||||
);
|
||||
}
|
||||
@@ -734,50 +712,66 @@ void SkyBrowserModule::startRotation(glm::dvec3 endAnimation) {
|
||||
// Save coordinates to rotate to in galactic world coordinates
|
||||
_endAnimation = endAnimation;
|
||||
_startAnimation = skybrowser::cameraDirectionGalactic();
|
||||
_isRotating = true;
|
||||
_cameraIsRotating = true;
|
||||
}
|
||||
|
||||
void SkyBrowserModule::rotateCamera(double deltaTime) {
|
||||
|
||||
|
||||
// Find smallest angle between the two vectors
|
||||
double smallestAngle = std::acos(glm::dot(_startAnimation, _endAnimation) / (glm::length(_startAnimation) * glm::length(_endAnimation)));
|
||||
// Only keep animating when target is not at final position
|
||||
if (abs(smallestAngle) > 0.0001) {
|
||||
// Calculate rotation this frame
|
||||
double rotationAngle = smallestAngle * deltaTime;
|
||||
// Create the rotation matrix for local camera space
|
||||
glm::dvec3 rotationAxis = glm::normalize(glm::cross(_startAnimation, _endAnimation));
|
||||
glm::dmat4 rotmat = glm::rotate(rotationAngle, rotationAxis);
|
||||
double smallestAngle = skybrowser::angleVector(_startAnimation, _endAnimation);
|
||||
|
||||
if(smallestAngle > _threshold) {
|
||||
|
||||
glm::dmat4 rotMat;
|
||||
skybrowser::incrementalAnimationMatrix(
|
||||
rotMat,
|
||||
_startAnimation,
|
||||
_endAnimation,
|
||||
deltaTime,
|
||||
_speed
|
||||
);
|
||||
|
||||
// Rotate
|
||||
global::navigationHandler->camera()->rotate(glm::quat_cast(rotmat));
|
||||
global::navigationHandler->camera()->rotate(glm::quat_cast(rotMat));
|
||||
|
||||
// Update camera direction
|
||||
_startAnimation = skybrowser::cameraDirectionGalactic();
|
||||
}
|
||||
else {
|
||||
_isRotating = false;
|
||||
_cameraIsRotating = false;
|
||||
}
|
||||
}
|
||||
|
||||
bool SkyBrowserModule::fadeBrowserAndTarget(bool makeTransparent, double fadeTime, double deltaTime) {
|
||||
bool SkyBrowserModule::fadeBrowserAndTarget(bool makeTransparent, double fadeTime,
|
||||
double deltaTime) {
|
||||
float opacityDelta = static_cast<float>(deltaTime / fadeTime);
|
||||
float highTreshold = 0.99f;
|
||||
float lowThreshold = 0.01f;
|
||||
float transparent = 0.0;
|
||||
float opaque = 1.0;
|
||||
|
||||
if (makeTransparent) {
|
||||
opacityDelta *= -1.f;
|
||||
}
|
||||
bool finished = true;
|
||||
for (std::pair <std::string, ScreenSpaceSkyBrowser*> idAndBrowser : _browsers) {
|
||||
ScreenSpaceSkyBrowser* browser = idAndBrowser.second;
|
||||
// If there is a target, fade it as well. Otherwise, skip
|
||||
ScreenSpaceSkyTarget* target = browser->getSkyTarget();
|
||||
|
||||
for (Pair pair : _targetsBrowsers) {
|
||||
ScreenSpaceSkyBrowser* browser = pair.getBrowser();
|
||||
ScreenSpaceSkyTarget* target = pair.getTarget();
|
||||
|
||||
bool targetFinished = true;
|
||||
bool browserFinished = true;
|
||||
|
||||
if (target) {
|
||||
target->setOpacity(target->opacity() + opacityDelta);
|
||||
float opacityTarget = abs(target->opacity());
|
||||
targetFinished = makeTransparent ? opacityTarget < lowThreshold : opacityTarget > highTreshold;
|
||||
|
||||
if (makeTransparent) {
|
||||
targetFinished = opacityTarget < lowThreshold;
|
||||
}
|
||||
else {
|
||||
targetFinished = opacityTarget > highTreshold;
|
||||
}
|
||||
if (targetFinished) {
|
||||
float newOpacity = makeTransparent ? transparent : opaque;
|
||||
target->setOpacity(newOpacity);
|
||||
@@ -786,13 +780,21 @@ bool SkyBrowserModule::fadeBrowserAndTarget(bool makeTransparent, double fadeTim
|
||||
// Keep fading the browsers until all are finished
|
||||
browser->getOpacity() = browser->getOpacity().value() + opacityDelta;
|
||||
float opacityBrowser = abs(browser->getOpacity().value());
|
||||
bool browserFinished = makeTransparent ? opacityBrowser < lowThreshold : opacityBrowser > highTreshold;
|
||||
|
||||
if (makeTransparent) {
|
||||
browserFinished = opacityBrowser < lowThreshold;
|
||||
}
|
||||
else {
|
||||
browserFinished = opacityBrowser > highTreshold;
|
||||
}
|
||||
|
||||
if (browserFinished && targetFinished) {
|
||||
browser->getOpacity() = makeTransparent ? transparent : opaque;
|
||||
}
|
||||
else {
|
||||
finished = false;
|
||||
}
|
||||
|
||||
}
|
||||
return finished;
|
||||
}
|
||||
@@ -811,37 +813,7 @@ std::string SkyBrowserModule::selectedBrowserId() {
|
||||
return _selectedBrowser;
|
||||
}
|
||||
|
||||
int SkyBrowserModule::loadImages(const std::string& root, const std::string& directory) {
|
||||
|
||||
// Load speck files for 3D positions
|
||||
std::filesystem::path globularClusters = absPath("${BASE}/sync/http/digitaluniverse_globularclusters_speck/2/gc.speck");
|
||||
std::filesystem::path openClusters = absPath("${BASE}/sync/http/digitaluniverse_openclusters_speck/2/oc.speck");
|
||||
|
||||
speck::Dataset speckGlobularClusters = speck::loadSpeckFile(globularClusters);
|
||||
speck::Dataset speckOpenClusters = speck::loadSpeckFile(openClusters);
|
||||
|
||||
_dataHandler->loadSpeckData(speckGlobularClusters);
|
||||
_dataHandler->loadSpeckData(speckOpenClusters);
|
||||
|
||||
int nLoadedImages;
|
||||
|
||||
// Read from disc
|
||||
bool loadedImages = _dataHandler->loadWtmlCollectionsFromDirectory(directory);
|
||||
|
||||
// Reading from url if there is no directory
|
||||
if (loadedImages) {
|
||||
LINFO("Loading images from directory");
|
||||
}
|
||||
else {
|
||||
LINFO("Loading images from url");
|
||||
_dataHandler->loadWtmlCollectionsFromUrl(directory, root, "root");
|
||||
}
|
||||
|
||||
nLoadedImages = _dataHandler->loadImagesFromLoadedXmls();
|
||||
LINFO("Loaded " + std::to_string(nLoadedImages) + " WorldWide Telescope images.");
|
||||
|
||||
return nLoadedImages;
|
||||
}
|
||||
|
||||
bool SkyBrowserModule::cameraInSolarSystem() {
|
||||
return _cameraInSolarSystem;
|
||||
|
||||
Reference in New Issue
Block a user