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

Fix linking error when OpenSpace is compiled without the globebrowsing module

Browse Source
This commit is contained in:
Alexander Bock
2016-08-29 10:45:59 +02:00
parent 04f206da76
commit 193e2bdc64
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/interaction/interactionmode.h
+2 -2
View File
@@ -116,11 +116,11 @@ protected:
void set(T value, double dt) {
_targetValue = value;
_currentValue = _currentValue + (_targetValue - _currentValue) *
min(_scaleFactor * dt, 1.0); // less or equal to 1.0 keeps it stable
std::min(_scaleFactor * dt, 1.0); // less or equal to 1.0 keeps it stable
}
void decelerate(double dt) {
_currentValue = _currentValue + (- _currentValue) *
min(_scaleFactor * _friction * dt, 1.0); // less or equal to 1.0 keeps it stable
std::min(_scaleFactor * _friction * dt, 1.0); // less or equal to 1.0 keeps it stable
}
void setHard(T value) {
_targetValue = value;
src/interaction/interactionmode.cpp
+6 -1
View File
@@ -35,8 +35,10 @@
#include <glm/gtx/quaternion.hpp>
#ifdef OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
#include <modules/globebrowsing/globes/renderableglobe.h>
#include <modules/globebrowsing/chunk/chunkedlodglobe.h>
#endif
namespace {
@@ -468,6 +470,7 @@ GlobeBrowsingInteractionMode::~GlobeBrowsingInteractionMode() {
void GlobeBrowsingInteractionMode::setFocusNode(SceneGraphNode* focusNode) {
InteractionMode::setFocusNode(focusNode);
#ifdef OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
Renderable* baseRenderable = _focusNode->renderable();
if (RenderableGlobe* globe = dynamic_cast<RenderableGlobe*>(baseRenderable)) {
_globe = globe;
@@ -476,13 +479,14 @@ void GlobeBrowsingInteractionMode::setFocusNode(SceneGraphNode* focusNode) {
LWARNING("Focus node is not a renderable globe. GlobeBrowsingInteraction is not possible");
_globe = nullptr;
}
#endif // OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
}
void GlobeBrowsingInteractionMode::updateCameraStateFromMouseStates(Camera& camera) {
// Update synched data
_mouseStates->postSynchronizationPreDraw();
#ifdef OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
using namespace glm;
if (_focusNode && _globe) {
// Declare variables to use in interaction calculations
@@ -631,6 +635,7 @@ void GlobeBrowsingInteractionMode::updateCameraStateFromMouseStates(Camera& came
camera.setPositionVec3(camPos);
camera.setRotation(globalCameraRotation * localCameraRotation);
}
#endif // OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
}
} // namespace interaction