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

Adapt to new master: Pointer notation for globals

Browse Source
This commit is contained in:
Emma Broman
2020-10-27 08:51:49 +01:00
parent 4fc3a01177
commit 353b950fc6
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/autonavigation/autonavigationhandler.cpp
View File

@@ -157,11 +157,11 @@ AutoNavigationHandler::AutoNavigationHandler()
AutoNavigationHandler::~AutoNavigationHandler() {} // NOLINT
Camera* AutoNavigationHandler::camera() const {
return global::navigationHandler.camera();
return global::navigationHandler->camera();
}
const SceneGraphNode* AutoNavigationHandler::anchor() const {
return global::navigationHandler.anchorNode();
return global::navigationHandler->anchorNode();
}
bool AutoNavigationHandler::hasFinished() const {
@@ -211,7 +211,7 @@ void AutoNavigationHandler::updateCamera(double deltaTime) {
// navigation when we reach the end.
std::string currentAnchor = anchor()->identifier();
if (currentAnchor != newAnchor) {
global::navigationHandler.orbitalNavigator().setAnchorNode(newAnchor);
global::navigationHandler->orbitalNavigator().setAnchorNode(newAnchor);
}
if (!_includeRoll) {
@@ -296,10 +296,10 @@ void AutoNavigationHandler::startPath() {
);
// TODO: remove this line at the end of our project. Used to simplify testing
global::timeManager.setPause(true);
global::timeManager->setPause(true);
//OBS! Until we can handle simulation time: early out if not paused
if (!global::timeManager.isPaused()) {
if (!global::timeManager->isPaused()) {
LERROR("Simulation time must be paused to run a camera path.");
return;
}
@@ -430,7 +430,7 @@ std::vector<glm::dvec3> AutoNavigationHandler::getControlPoints() {
Waypoint AutoNavigationHandler::wayPointFromCamera() {
const glm::dvec3 pos = camera()->positionVec3();
const glm::dquat rot = camera()->rotationQuaternion();
const std::string node = global::navigationHandler.anchorNode()->identifier();
const std::string node = global::navigationHandler->anchorNode()->identifier();
return Waypoint{ pos, rot, node };
}
@@ -654,7 +654,7 @@ Waypoint AutoNavigationHandler::computeDefaultWaypoint(const TargetNodeInstructi
std::vector<SceneGraphNode*> AutoNavigationHandler::findRelevantNodes() {
const std::vector<SceneGraphNode*>& allNodes =
global::renderEngine.scene()->allSceneGraphNodes();
global::renderEngine->scene()->allSceneGraphNodes();
const std::vector<std::string> relevantTags = _relevantNodeTags;