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

Fix anchor-and-aim related errors

Browse Source
This commit is contained in:
Emil Axelsson
2019-03-04 22:59:06 +01:00
parent b5eb41e27f
commit 6b28bac054
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/engine/openspaceengine.cpp
View File

@@ -645,6 +645,8 @@ void OpenSpaceEngine::loadSingleAsset(const std::string& assetPath) {
}
_scene = std::make_unique<Scene>(std::move(sceneInitializer));
global::renderEngine.setScene(_scene.get());
global::rootPropertyOwner.addPropertySubOwner(_scene.get());
_scene->setCamera(std::make_unique<Camera>());
Camera* camera = _scene->camera();
@@ -661,8 +663,6 @@ void OpenSpaceEngine::loadSingleAsset(const std::string& assetPath) {
);
}
global::renderEngine.setScene(_scene.get());
_assetManager->removeAll();
_assetManager->add(assetPath);

7
src/interaction/orbitalnavigator.cpp
View File

@@ -581,6 +581,9 @@ void OrbitalNavigator::setAimNode(const std::string& aimNode) {
}
void OrbitalNavigator::startRetargetAnchor() {
if (!_anchorNode) {
return;
}
const glm::dvec3 camPos = _camera->positionVec3();
const glm::dvec3 camDir = _camera->viewDirectionWorldSpace();
@@ -600,6 +603,10 @@ void OrbitalNavigator::startRetargetAnchor() {
}
void OrbitalNavigator::startRetargetAim() {
if (!_aimNode) {
return;
}
const glm::dvec3 camPos = _camera->positionVec3();
const glm::dvec3 camDir = _camera->viewDirectionWorldSpace();
const glm::dvec3 centerPos = _aimNode->worldPosition();