mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-27 07:18:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

Re-enable scene switching again after incorrect merge from develop

Browse Source
This commit is contained in:
Erik Broberg
2016-08-02 20:48:53 -04:00
parent 244c18fdc7
commit 95da433397
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/interaction/interactionmode.cpp
View File

@@ -150,8 +150,10 @@ InteractionMode::~InteractionMode() {
void InteractionMode::setFocusNode(SceneGraphNode* focusNode) {
_focusNode = focusNode;
_previousFocusNodePosition = _focusNode->worldPosition().dvec3();
_previousFocusNodeRotation = glm::quat_cast(_focusNode->worldRotationMatrix());
if (_focusNode != nullptr) {
_previousFocusNodePosition = _focusNode->worldPosition().dvec3();
_previousFocusNodeRotation = glm::quat_cast(_focusNode->worldRotationMatrix());
}
}
SceneGraphNode* InteractionMode::focusNode() {

8
src/scene/scene.cpp
View File

@@ -90,12 +90,12 @@ bool Scene::deinitialize() {
void Scene::update(const UpdateData& data) {
if (!_sceneGraphToLoad.empty()) {
OsEng.renderEngine().scene()->clearSceneGraph();
try {
try {
loadSceneInternal(_sceneGraphToLoad);
// Reset the InteractionManager to Orbital/default mode
// TODO: Decide if it belongs in the scene and/or how it gets reloaded
// OsEng.interactionHandler().setInteractionModeToOrbital();
loadSceneInternal(_sceneGraphToLoad);
OsEng.interactionHandler().setInteractionMode("Orbital");
// After loading the scene, the keyboard bindings have been set