mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 20:21:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge resolve

Browse Source
This commit is contained in:
Ylva Selling
2021-03-08 08:49:39 +01:00
parent 72a6b3623d af98784dc4
commit a77fbcfcfe
6 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/skybrowser/skybrowsermodule.cpp
View File

@@ -23,8 +23,18 @@
****************************************************************************************/
#include <modules/skybrowser/skybrowsermodule.h>
//#include <modules/webbrowser/webbrowsermodule.h>
//#include <modules/webbrowser/include/screenspacebrowser.h>
#include <modules/base/rendering/screenspaceimagelocal.h>
#include <openspace/rendering/screenspacerenderable.h>
#include <openspace/rendering/renderable.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/engine/moduleengine.h>
#include <openspace/engine/globals.h>
#include <openspace/engine/globalscallbacks.h>
#include <openspace/interaction/navigationhandler.h>
@@ -144,6 +154,7 @@ bool SkybrowserModule::sendMessageToWWT(const ghoul::Dictionary& msg) {
}
void SkybrowserModule::WWTfollowCamera() {
showTarget();
while (true) {
// Get camera view direction
const glm::dvec3 viewDirection = global::navigationHandler->camera()->viewDirectionWorldSpace();